HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> e5e300f (Manifest_cache true)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> f0a057d (Manifest_cache true)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> 07edb26 (Manifest_cache true)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> 078304c (Rebased)
=======
>>>>>>> 59f060e (Manifest_cache true)
=======
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> eda022f (Manifest_cache true)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 1577aeb (Rebased)
=======
<<<<<<< HEAD
>>>>>>> 836a973 (Rebased)
=======
<<<<<<< HEAD
>>>>>>> ee78f39 (Rebased)
=======
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> 0b5b269 (Fix)
=======
>>>>>>> f1f4057 (Manifest_cache true)
=======
>>>>>>> 5f79779 (Featire specs)
=======
>>>>>>> 56a05fb (Featire specs)
=======
>>>>>>> 6d21330 (Featire specs)
=======
>>>>>>> 27e3351 (Featire specs)
=======
>>>>>>> 1ac6be1 (Fix)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> bebaea7 (Rebased)
=======
>>>>>>> 590c4c7 (Manifest_cache true)
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> 1a9aba9 (Fix)
=======
>>>>>>> e6da150 (Manifest_cache true)
=======
>>>>>>> 5f76842 (Featire specs)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> d7fadcd (Featire specs)
=======
>>>>>>> 49e3b70 (Fix)
=======
>>>>>>> 9710ee6 (Manifest_cache true)
=======
>>>>>>> 2fd2048 (Featire specs)
=======
>>>>>>> bc0ff2c (Featire specs)
=======
>>>>>>> 9bf2aae (Featire specs)
=======
>>>>>>> 5ce1a6d (Featire specs)
=======
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 3b03895 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 94841b5 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> e54ceb0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 56a05fb (Featire specs)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6d21330 (Featire specs)
=======
>>>>>>> 5a0bcc7 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 27e3351 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> e54ceb0 (Featire specs)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> 5a0bcc7 (Featire specs)
=======
>>>>>>> d7fadcd (Featire specs)
=======
>>>>>>> 8577deb (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> bc0ff2c (Featire specs)
=======
>>>>>>> ebe5361 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 9bf2aae (Featire specs)
=======
>>>>>>> d3d58e0 (Featire specs)
=======
>>>>>>> 5ce1a6d (Featire specs)
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> 56a05fb (Featire specs)
=======
>>>>>>> 6d21330 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> bc0ff2c (Featire specs)
=======
>>>>>>> 9bf2aae (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
>>>>>>> c033601 (Rebased)
=======
>>>>>>> 4d1f738 (Manifest_cache true)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 3723aad (Featire specs)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> 27e3351 (Featire specs)
=======
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> d7fadcd (Featire specs)
=======
>>>>>>> 5ce1a6d (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> bf554f4 (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5bc98da (Manifest_cache true)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 715fac2 (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3dc272d (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
=======
=======
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ee78f39 (Rebased)
=======
=======
>>>>>>> 4d1f738 (Manifest_cache true)
>>>>>>> e5e300f (Manifest_cache true)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
=======
>>>>>>> bf554f4 (Rebased)
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 1772e92 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f0a057d (Manifest_cache true)
=======
=======
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 28fed3c (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> 64d4167 (Featire specs)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> 13fd74f (Featire specs)
=======
=======
>>>>>>> 4552227 (Featire specs)
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> 1ebea35 (Manifest_cache true)
=======
>>>>>>> 715fac2 (Featire specs)
=======
=======
>>>>>>> c033601 (Rebased)
>>>>>>> 836a973 (Rebased)
=======
=======
>>>>>>> 4d1f738 (Manifest_cache true)
>>>>>>> 07edb26 (Manifest_cache true)
=======
>>>>>>> 5be567f (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
=======
=======
>>>>>>> bf554f4 (Rebased)
>>>>>>> 078304c (Rebased)
=======
>>>>>>> 1772e92 (Manifest_cache true)
>>>>>>> 59f060e (Manifest_cache true)
=======
>>>>>>> c006a44 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> fefbd35 (Featire specs)
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 0b5b269 (Fix)
=======
=======
>>>>>>> 7f9bd73 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f1f4057 (Manifest_cache true)
=======
=======
>>>>>>> 5f76842 (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5f79779 (Featire specs)
=======
=======
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 56a05fb (Featire specs)
=======
=======
>>>>>>> a038b16 (Featire specs)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6d21330 (Featire specs)
=======
=======
>>>>>>> d7fadcd (Featire specs)
=======
=======
>>>>>>> 4552227 (Featire specs)
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 27e3351 (Featire specs)
=======
=======
>>>>>>> 8f1bc14 (Fix)
<<<<<<< HEAD
>>>>>>> 1ac6be1 (Fix)
=======
>>>>>>> cde4834 (Manifest_cache true)
=======
>>>>>>> 2737f2d (Manifest_cache true)
=======
>>>>>>> 3dc272d (Featire specs)
=======
=======
>>>>>>> c033601 (Rebased)
>>>>>>> 1577aeb (Rebased)
=======
=======
>>>>>>> 4d1f738 (Manifest_cache true)
>>>>>>> eda022f (Manifest_cache true)
=======
>>>>>>> 113da87 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 20256f8 (Featire specs)
=======
=======
>>>>>>> bf554f4 (Rebased)
>>>>>>> bebaea7 (Rebased)
=======
>>>>>>> 1772e92 (Manifest_cache true)
>>>>>>> 590c4c7 (Manifest_cache true)
=======
>>>>>>> 28fed3c (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> 13fd74f (Featire specs)
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1a9aba9 (Fix)
=======
=======
>>>>>>> 7f9bd73 (Manifest_cache true)
>>>>>>> e6da150 (Manifest_cache true)
=======
>>>>>>> 5f76842 (Featire specs)
=======
=======
>>>>>>> e54ceb0 (Featire specs)
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> d7fadcd (Featire specs)
=======
=======
>>>>>>> 8f1bc14 (Fix)
>>>>>>> 49e3b70 (Fix)
=======
=======
>>>>>>> f1c7248 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 9710ee6 (Manifest_cache true)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 1cb2e82 (Featire specs)
<<<<<<< HEAD
>>>>>>> 2fd2048 (Featire specs)
=======
=======
>>>>>>> 8577deb (Featire specs)
<<<<<<< HEAD
>>>>>>> bc0ff2c (Featire specs)
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> ebe5361 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9bf2aae (Featire specs)
=======
=======
=======
>>>>>>> 4552227 (Featire specs)
>>>>>>> d3d58e0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5ce1a6d (Featire specs)
=======
=======
>>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> be2f578 (Manifest_cache true)
=======
>>>>>>> 2471c87 (Add login registration pages)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> ed97c39 (Manifest_cache true)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 65459e8 (Add login registration pages)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 587ce47 (Manifest_cache true)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
>>>>>>> cb955a0 (Add login registration pages)
=======
>>>>>>> bebaea7 (Rebased)
=======
>>>>>>> eaef86a (Fix)
=======
>>>>>>> b35d1f8 (Featire specs)
=======
>>>>>>> 5518ff0 (Manifest_cache true)
=======
>>>>>>> 75be480 (Manifest_cache true)
=======
>>>>>>> a1fe6da (Featire specs)
=======
>>>>>>> 027f794 (Manifest_cache true)
=======
=======
>>>>>>> e2bfd89 (Manifest_cache true)
=======
>>>>>>> aeec696 (Add login registration pages)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> d1bae53 (Manifest_cache true)
=======
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
>>>>>>> b5affcb (Add login registration pages)
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> 35d9b13 (Manifest_cache true)
=======
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4f7c979 (Add login registration pages)
=======
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> f7f7abc (Manifest_cache true)
=======
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
>>>>>>> 60943cc (Add login registration pages)
=======
>>>>>>> 1a9aba9 (Fix)
=======
>>>>>>> 4f1a459 (Fix)
=======
>>>>>>> dacfb20 (Featire specs)
=======
>>>>>>> 459d812 (Manifest_cache true)
=======
>>>>>>> 3fef583 (Manifest_cache true)
=======
>>>>>>> 93db8b1 (Featire specs)
=======
>>>>>>> b746b60 (Manifest_cache true)
=======
=======
>>>>>>> e965665 (Manifest_cache true)
=======
>>>>>>> 01d9256 (Add login registration pages)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> 10b6c72 (Manifest_cache true)
=======
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
=======
>>>>>>> b26425c (Add login registration pages)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> a77cc8a (Manifest_cache true)
=======
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 845289f (Add login registration pages)
=======
>>>>>>> d7fadcd (Featire specs)
=======
>>>>>>> 39467b5 (Manifest_cache true)
=======
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 569a007 (Add login registration pages)
=======
>>>>>>> 49e3b70 (Fix)
=======
>>>>>>> 78d0719 (Featire specs)
=======
>>>>>>> 6edce20 (Manifest_cache true)
=======
>>>>>>> 04108c4 (Manifest_cache true)
=======
>>>>>>> f861b82 (Featire specs)
=======
>>>>>>> d8298a1 (Manifest_cache true)
=======
=======
>>>>>>> bdea3aa (Manifest_cache true)
=======
>>>>>>> 591c3b2 (Add login registration pages)
=======
>>>>>>> bc0ff2c (Featire specs)
=======
>>>>>>> 07682bd (Manifest_cache true)
=======
>>>>>>> 45f6de0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 055b00f (Add login registration pages)
=======
>>>>>>> 9bf2aae (Featire specs)
=======
>>>>>>> e2d040a (Manifest_cache true)
=======
>>>>>>> 7718476 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e7ec208 (Add login registration pages)
=======
>>>>>>> 5ce1a6d (Featire specs)
=======
>>>>>>> 307ac6e (Manifest_cache true)
=======
>>>>>>> cea736b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 61908af (Add login registration pages)
=======
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
=======
>>>>>>> 081d138 (Checkout Add CreditCard Address Delivery method)
=======
>>>>>>> aa4fb26 (Add sort orders)
=======
=======
>>>>>>> fe7e312 (Manifest_cache true)
=======
>>>>>>> fb10fe4 (Add login registration pages)
=======
>>>>>>> 8577deb (Featire specs)
=======
>>>>>>> 94d9078 (Manifest_cache true)
=======
>>>>>>> 7b112c2 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 69eb97e (Add login registration pages)
=======
>>>>>>> ebe5361 (Featire specs)
=======
>>>>>>> 2956182 (Manifest_cache true)
=======
>>>>>>> a455e8a (Fix book_spec decrease quantity and price)
=======
>>>>>>> 089f8cf (Add login registration pages)
=======
>>>>>>> d3d58e0 (Featire specs)
=======
>>>>>>> 9d9ff14 (Manifest_cache true)
=======
>>>>>>> 59078f6 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0edd9b7 (Add login registration pages)
Generated
2022-10-07T16:34:44+03:00
>>>>>>> 1cb2e82 (Featire specs)
>>>>>>> 2fd2048 (Featire specs)
=======
=======
>>>>>>> 8c7bad7 (Manifest_cache true)
=======
>>>>>>> 0005d4a (Add login registration pages)
=======
>>>>>>> e54ceb0 (Featire specs)
=======
>>>>>>> 1bfc7a6 (Manifest_cache true)
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 58d403b (Add login registration pages)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
>>>>>>> 3b839af (Manifest_cache true)
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
=======
>>>>>>> b575a28 (Add login registration pages)
=======
>>>>>>> 5a0bcc7 (Featire specs)
=======
>>>>>>> 0832698 (Manifest_cache true)
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5caffae (Add login registration pages)
Generated
2022-10-07T13:38:31+03:00
>>>>>>> a2de409 (Featire specs)
>>>>>>> 5f76842 (Featire specs)
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> f182ac7 (Add login registration pages)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a624084 (Add login registration pages)
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> b15044a (Manifest_cache true)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6a9fede (Add login registration pages)
Generated
2022-10-06T18:57:15+03:00
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 28fed3c (Featire specs)
=======
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
>>>>>>> 9ec6862 (Add login registration pages)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
>>>>>>> cacbab9 (Add login registration pages)
Generated
2022-10-06T17:07:21+03:00
>>>>>>> b832d45 (Featire specs)
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> b763f5b (Manifest_cache true)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 0c9131d (Manifest_cache true)
=======
>>>>>>> 902b803 (Manifest_cache true)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 7945032 (Manifest_cache true)
=======
>>>>>>> 0bdcc5e (Manifest_cache true)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> b00b319 (Manifest_cache true)
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
>>>>>>> cb74525 (Add login registration pages)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> b459807 (Manifest_cache true)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8be9029 (Add login registration pages)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7d58507 (Add login registration pages)
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> e9f3851 (Manifest_cache true)
=======
>>>>>>> 307f31f (Manifest_cache true)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> d782a28 (Manifest_cache true)
=======
=======
>>>>>>> 35d17b9 (Manifest_cache true)
=======
>>>>>>> 852864e (Add login registration pages)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> add330c (Manifest_cache true)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> 551f3c1 (Add login registration pages)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 15bff2e (Manifest_cache true)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> ccec311 (Add login registration pages)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> 6c71f00 (Manifest_cache true)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8c3e531 (Add login registration pages)
=======
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> 851b4c0 (Fix)
=======
>>>>>>> 0b5b269 (Fix)
=======
>>>>>>> 8ad6192 (Fix)
=======
>>>>>>> d6f7da8 (Featire specs)
=======
>>>>>>> ab67c96 (Manifest_cache true)
=======
>>>>>>> 4e0a8d9 (Manifest_cache true)
=======
>>>>>>> f5da5ac (Featire specs)
=======
>>>>>>> 036bb32 (Manifest_cache true)
=======
=======
>>>>>>> 3e8974a (Manifest_cache true)
=======
>>>>>>> 282f108 (Add login registration pages)
=======
>>>>>>> 56a05fb (Featire specs)
=======
>>>>>>> 23e9df9 (Manifest_cache true)
=======
>>>>>>> da83d1a (Fix book_spec decrease quantity and price)
=======
>>>>>>> db0e854 (Add login registration pages)
=======
>>>>>>> 6d21330 (Featire specs)
=======
>>>>>>> 9617beb (Manifest_cache true)
=======
>>>>>>> a2a431e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2cdd6f4 (Add login registration pages)
=======
>>>>>>> 27e3351 (Featire specs)
=======
>>>>>>> b40a04e (Manifest_cache true)
=======
>>>>>>> e733663 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3a43955 (Add login registration pages)
=======
>>>>>>> 1ac6be1 (Fix)
=======
=======
>>>>>>> 8c7bad7 (Manifest_cache true)
=======
>>>>>>> 0005d4a (Add login registration pages)
=======
>>>>>>> e54ceb0 (Featire specs)
=======
>>>>>>> 1bfc7a6 (Manifest_cache true)
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 58d403b (Add login registration pages)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
>>>>>>> 3b839af (Manifest_cache true)
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
=======
>>>>>>> b575a28 (Add login registration pages)
=======
>>>>>>> 5a0bcc7 (Featire specs)
=======
>>>>>>> 0832698 (Manifest_cache true)
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5caffae (Add login registration pages)
Generated
2022-10-07T13:38:31+03:00
>>>>>>> a2de409 (Featire specs)
>>>>>>> 5f79779 (Featire specs)
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> f182ac7 (Add login registration pages)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a624084 (Add login registration pages)
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> b15044a (Manifest_cache true)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6a9fede (Add login registration pages)
Generated
2022-10-06T18:57:15+03:00
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 078304c (Rebased)
=======
>>>>>>> d15fe1d (Fix)
=======
>>>>>>> b4763a2 (Featire specs)
=======
>>>>>>> dcf74e1 (Manifest_cache true)
=======
>>>>>>> d66884b (Manifest_cache true)
=======
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> 022e63e (Manifest_cache true)
=======
=======
>>>>>>> 10bdfea (Manifest_cache true)
=======
>>>>>>> 0fc3bf0 (Add login registration pages)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> d70f030 (Manifest_cache true)
=======
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
>>>>>>> af9487a (Add login registration pages)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> cae047f (Manifest_cache true)
=======
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 140c987 (Add login registration pages)
=======
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> a9e654b (Manifest_cache true)
=======
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0c3a150 (Add login registration pages)
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> f182ac7 (Add login registration pages)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a624084 (Add login registration pages)
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> b15044a (Manifest_cache true)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6a9fede (Add login registration pages)
Generated
2022-10-06T18:57:15+03:00
>>>>>>> c4adab0 (Featire specs)
>>>>>>> c006a44 (Featire specs)
=======
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
>>>>>>> 9ec6862 (Add login registration pages)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
>>>>>>> cacbab9 (Add login registration pages)
Generated
2022-10-06T17:07:21+03:00
>>>>>>> b832d45 (Featire specs)
>>>>>>> a9bf83f (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d780a52 (Rebased)
=======
>>>>>>> 83979de (Featire specs)
=======
>>>>>>> d0f5c14 (Manifest_cache true)
=======
>>>>>>> cfd1f7f (Manifest_cache true)
=======
>>>>>>> b3f2049 (Featire specs)
=======
>>>>>>> e031bce (Manifest_cache true)
=======
=======
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 02ba384 (Manifest_cache true)
=======
=======
>>>>>>> 9ec6862 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 264ef06 (Add login registration pages)
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3e35e (Featire specs)
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 926dfe5 (Manifest_cache true)
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c54769d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 57a2e05 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> a1a8477 (Add login registration pages)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 1677b1a (Featire specs)
=======
=======
>>>>>>> 00f8b58 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1830ff1 (Manifest_cache true)
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c346782 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> cacbab9 (Add login registration pages)
>>>>>>> 551615f (Add login registration pages)
Generated
2022-10-06T17:07:21+03:00
>>>>>>> b832d45 (Featire specs)
>>>>>>> 12bcf81 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> d96cf3b (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> d96cf3b (Featire specs)
=======
=======
>>>>>>> b6a32ab (Add login registration pages)
=======
>>>>>>> e50f73e (Add login registration pages)
>>>>>>> 5c33a07 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f764a87 (Fix book_spec decrease quantity and price)
=======
=======
<<<<<<< HEAD
>>>>>>> 22ee41c (Add login registration pages)
>>>>>>> b6a32ab (Add login registration pages)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
=======
<<<<<<< HEAD
>>>>>>> 22ee41c (Add login registration pages)
>>>>>>> e50f73e (Add login registration pages)
=======
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 9bebee5 (Manifest_cache true)
=======
>>>>>>> ee5935f (Manifest_cache true)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 394c6f3 (Manifest_cache true)
=======
=======
>>>>>>> 0b43b18 (Manifest_cache true)
=======
>>>>>>> 039806b (Add login registration pages)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> caaaa41 (Manifest_cache true)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 45f9f35 (Add login registration pages)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> 8874887 (Manifest_cache true)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 697ad44 (Add login registration pages)
=======
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
>>>>>>> 9ec6862 (Add login registration pages)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
>>>>>>> cacbab9 (Add login registration pages)
Generated
2022-10-06T17:07:21+03:00
>>>>>>> b832d45 (Featire specs)
>>>>>>> 5be567f (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 3dc272d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 715fac2 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
=======
<<<<<<< HEAD
>>>>>>> 22ee41c (Add login registration pages)
>>>>>>> 03c0867 (Add login registration pages)
=======
>>>>>>> 3dc272d (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
=======
=======
<<<<<<< HEAD
>>>>>>> 22ee41c (Add login registration pages)
>>>>>>> 27ceb6f (Add login registration pages)
Generated
2022-09-06T10:36:10+03:00
=======
<<<<<<< HEAD
Generated
2022-09-06T11:37:55+03:00
=======
Generated
2022-09-06T10:36:10+03:00
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d96cf3b (Featire specs)
=======
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> 3dc272d (Featire specs)
=======
Generated
2022-09-05T19:21:30+03:00
>>>>>>> 752f0c0 (Featire specs)
=======
Generated
2022-09-06T10:36:10+03:00
>>>>>>> bd8bda4 (Manifest_cache true)
=======
Generated
2022-09-05T19:21:30+03:00
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 35d17b9 (Manifest_cache true)
=======
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 0b43b18 (Manifest_cache true)
=======
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 10bdfea (Manifest_cache true)
=======
>>>>>>> 5f79779 (Featire specs)
=======
>>>>>>> 3e8974a (Manifest_cache true)
=======
>>>>>>> 3dc272d (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> be2f578 (Manifest_cache true)
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> e2bfd89 (Manifest_cache true)
=======
>>>>>>> 5f76842 (Featire specs)
=======
>>>>>>> e965665 (Manifest_cache true)
=======
>>>>>>> 2fd2048 (Featire specs)
=======
>>>>>>> bdea3aa (Manifest_cache true)
=======
Generated
2022-09-06T10:36:10+03:00
>>>>>>> aa7b40c (Manifest_cache true)
=======
Generated
2022-09-06T17:39:47+03:00
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> cb74525 (Add login registration pages)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 852864e (Add login registration pages)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 039806b (Add login registration pages)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 0fc3bf0 (Add login registration pages)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> 282f108 (Add login registration pages)
=======
>>>>>>> 56a05fb (Featire specs)
=======
>>>>>>> 2471c87 (Add login registration pages)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> aeec696 (Add login registration pages)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> 01d9256 (Add login registration pages)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> 591c3b2 (Add login registration pages)
=======
>>>>>>> bc0ff2c (Featire specs)
=======
Generated
2022-09-05T19:21:30+03:00
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
Generated
2022-09-06T10:36:10+03:00
>>>>>>> 183b6c5 (Manifest_cache true)
=======
Generated
2022-09-06T11:37:55+03:00
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
Generated
2022-10-06T17:07:21+03:00
>>>>>>> aca90e3 (Rebased)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> d96cf3b (Featire specs)
=======
=======
>>>>>>> 926dfe5 (Manifest_cache true)
=======
>>>>>>> b459807 (Manifest_cache true)
=======
>>>>>>> add330c (Manifest_cache true)
=======
>>>>>>> caaaa41 (Manifest_cache true)
=======
>>>>>>> d70f030 (Manifest_cache true)
=======
>>>>>>> 23e9df9 (Manifest_cache true)
=======
>>>>>>> ed97c39 (Manifest_cache true)
=======
>>>>>>> d1bae53 (Manifest_cache true)
=======
>>>>>>> 10b6c72 (Manifest_cache true)
=======
>>>>>>> 07682bd (Manifest_cache true)
>>>>>>> 5c33a07 (Featire specs)
=======
=======
Generated
2022-09-06T10:36:10+03:00
>>>>>>> 183b6c5 (Manifest_cache true)
=======
Generated
2022-09-06T11:37:55+03:00
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8be9029 (Add login registration pages)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> 551f3c1 (Add login registration pages)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 45f9f35 (Add login registration pages)
=======
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
>>>>>>> af9487a (Add login registration pages)
=======
>>>>>>> da83d1a (Fix book_spec decrease quantity and price)
=======
>>>>>>> db0e854 (Add login registration pages)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 65459e8 (Add login registration pages)
=======
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
>>>>>>> b5affcb (Add login registration pages)
=======
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
=======
>>>>>>> b26425c (Add login registration pages)
=======
>>>>>>> 45f6de0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 055b00f (Add login registration pages)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> f764a87 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> e50f73e (Add login registration pages)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 03c0867 (Add login registration pages)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 27ceb6f (Add login registration pages)
=======
=======
Generated
2022-09-06T17:39:47+03:00
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> 6d21330 (Featire specs)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> 9bf2aae (Featire specs)
>>>>>>> 22ee41c (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b6a32ab (Add login registration pages)
=======
=======
Generated
2022-10-06T17:07:21+03:00
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d780a52 (Rebased)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
>>>>>>> 6fa625b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> c8cdb08 (Manifest_cache true)
<<<<<<< HEAD
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
>>>>>>> 7945032 (Manifest_cache true)
=======
>>>>>>> 0bdcc5e (Manifest_cache true)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> b00b319 (Manifest_cache true)
Generated
2022-10-06T17:07:21+03:00
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
Generated
2022-10-06T18:57:15+03:00
>>>>>>> 59d75f9 (Featire specs)
=======
Generated
2022-09-05T19:21:30+03:00
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 83979de (Featire specs)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 7945032 (Manifest_cache true)
=======
=======
Generated
2022-09-06T10:36:10+03:00
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b9cc4e9 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d0f5c14 (Manifest_cache true)
=======
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
>>>>>>> 0bdcc5e (Manifest_cache true)
=======
=======
Generated
2022-09-06T11:37:55+03:00
=======
Generated
2022-09-06T10:36:10+03:00
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> 6fa625b (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> cfd1f7f (Manifest_cache true)
=======
=======
>>>>>>> 6fa625b (Manifest_cache true)
>>>>>>> 563720e (Featire specs)
=======
=======
Generated
2022-09-05T19:21:30+03:00
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d782a28 (Manifest_cache true)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> b00b319 (Manifest_cache true)
=======
=======
Generated
2022-09-06T10:36:10+03:00
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> c8cdb08 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e031bce (Manifest_cache true)
=======
=======
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 12bcf81 (Featire specs)
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
=======
Generated
2022-09-06T10:36:10+03:00
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 02ba384 (Manifest_cache true)
=======
=======
>>>>>>> 9ec6862 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 264ef06 (Add login registration pages)
=======
=======
>>>>>>> 904663c (Featire specs)
=======
=======
Generated
2022-09-05T19:21:30+03:00
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fd3e35e (Featire specs)
=======
=======
>>>>>>> b459807 (Manifest_cache true)
=======
=======
Generated
2022-09-06T10:36:10+03:00
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 24b58e6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 926dfe5 (Manifest_cache true)
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c54769d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 8be9029 (Add login registration pages)
=======
=======
Generated
2022-09-06T17:39:47+03:00
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 57a2e05 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a1a8477 (Add login registration pages)
=======
=======
>>>>>>> e5752db (Featire specs)
=======
=======
Generated
2022-09-05T19:21:30+03:00
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 15bff2e (Manifest_cache true)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 1677b1a (Featire specs)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
=======
Generated
2022-09-06T10:36:10+03:00
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
>>>>>>> 00f8b58 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1830ff1 (Manifest_cache true)
=======
=======
>>>>>>> 00f8b58 (Manifest_cache true)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
Generated
2022-09-06T11:37:55+03:00
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ccec311 (Add login registration pages)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c346782 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 7d58507 (Add login registration pages)
=======
=======
Generated
2022-09-06T17:39:47+03:00
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> cacbab9 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 551615f (Add login registration pages)
=======
=======
Generated
2022-10-06T18:33:49+03:00
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d52ad35 (Rebased)
=======
=======
Generated
2022-10-06T18:57:15+03:00
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
=======
=======
Generated
2022-09-05T19:21:30+03:00
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
=======
=======
=======
Generated
2022-09-06T10:36:10+03:00
>>>>>>> 183b6c5 (Manifest_cache true)
=======
Generated
2022-09-06T11:37:55+03:00
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> 22ee41c (Add login registration pages)
>>>>>>> e50f73e (Add login registration pages)
=======
=======
Generated
2022-10-06T17:07:21+03:00
>>>>>>> c033601 (Rebased)
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
>>>>>>> 7945032 (Manifest_cache true)
=======
>>>>>>> 6fa625b (Manifest_cache true)
>>>>>>> 0bdcc5e (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> b00b319 (Manifest_cache true)
=======
=======
>>>>>>> b832d45 (Featire specs)
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
=======
>>>>>>> 9ec6862 (Add login registration pages)
>>>>>>> cb74525 (Add login registration pages)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> b459807 (Manifest_cache true)
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8be9029 (Add login registration pages)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 00f8b58 (Manifest_cache true)
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7d58507 (Add login registration pages)
=======
=======
Generated
2022-10-06T18:33:49+03:00
>>>>>>> bf554f4 (Rebased)
>>>>>>> 49e8a6c (Rebased)
=======
=======
Generated
2022-10-06T18:57:15+03:00
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
=======
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
Generated
2022-10-06T18:57:15+03:00
=======
Generated
2022-09-05T19:21:30+03:00
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
=======
=======
Generated
2022-09-06T10:36:10+03:00
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
=======
=======
=======
Generated
2022-09-06T11:37:55+03:00
=======
Generated
2022-09-06T10:36:10+03:00
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
=======
=======
=======
Generated
2022-09-05T19:21:30+03:00
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
=======
Generated
2022-09-06T10:36:10+03:00
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
=======
Generated
2022-09-06T10:36:10+03:00
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 35d17b9 (Manifest_cache true)
=======
=======
>>>>>>> f182ac7 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 852864e (Add login registration pages)
=======
=======
=======
Generated
2022-09-05T19:21:30+03:00
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
=======
Generated
2022-09-06T10:36:10+03:00
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> add330c (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
=======
Generated
2022-09-06T17:39:47+03:00
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 57da3ff (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 551f3c1 (Add login registration pages)
=======
=======
=======
Generated
2022-09-05T19:21:30+03:00
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
=======
Generated
2022-09-06T10:36:10+03:00
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 15bff2e (Manifest_cache true)
=======
=======
=======
Generated
2022-09-06T11:37:55+03:00
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
=======
Generated
2022-09-06T17:39:47+03:00
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> a624084 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> ccec311 (Add login registration pages)
=======
=======
=======
Generated
2022-09-05T19:21:30+03:00
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
=======
Generated
2022-09-06T10:36:10+03:00
>>>>>>> 998f08d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 6c71f00 (Manifest_cache true)
=======
=======
=======
Generated
2022-09-06T11:37:55+03:00
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
=======
=======
Generated
2022-09-06T17:39:47+03:00
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 6a9fede (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 8c3e531 (Add login registration pages)
=======
=======
Generated
2022-10-07T13:29:03+03:00
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
>>>>>>> 1d59aaa (Fix)
=======
=======
Generated
2022-10-07T13:38:31+03:00
>>>>>>> 446d79a (Fix)
>>>>>>> 851b4c0 (Fix)
=======
=======
Generated
2022-09-05T19:21:30+03:00
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> 715fac2 (Featire specs)
=======
=======
=======
Generated
2022-09-06T10:36:10+03:00
>>>>>>> 183b6c5 (Manifest_cache true)
=======
Generated
2022-09-06T11:37:55+03:00
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 22ee41c (Add login registration pages)
>>>>>>> 03c0867 (Add login registration pages)
=======
=======
Generated
2022-10-06T17:07:21+03:00
>>>>>>> c033601 (Rebased)
>>>>>>> 836a973 (Rebased)
=======
=======
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
>>>>>>> 6fa625b (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> c8cdb08 (Manifest_cache true)
Generated
2022-10-06T17:07:21+03:00
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
Generated
2022-10-06T18:57:15+03:00
>>>>>>> 59d75f9 (Featire specs)
=======
=======
>>>>>>> b5f64c6 (Manifest_cache true)
Generated
2022-10-07T13:38:31+03:00
>>>>>>> 864f339 (Featire specs)
=======
=======
>>>>>>> 3c386ca (Manifest_cache true)
Generated
2022-10-07T16:34:44+03:00
>>>>>>> c1749d5 (Featire specs)
=======
Generated
2022-09-05T19:21:30+03:00
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 2a25e4c (Featire specs)
=======
=======
=======
Generated
2022-09-06T10:36:10+03:00
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b9cc4e9 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 9bebee5 (Manifest_cache true)
=======
=======
=======
Generated
2022-09-06T11:37:55+03:00
=======
Generated
2022-09-06T10:36:10+03:00
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6fa625b (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> ee5935f (Manifest_cache true)
=======
=======
=======
Generated
2022-09-05T19:21:30+03:00
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 3e9f99d (Featire specs)
=======
=======
=======
Generated
2022-09-06T10:36:10+03:00
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> c8cdb08 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 394c6f3 (Manifest_cache true)
=======
=======
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5be567f (Featire specs)
=======
=======
=======
Generated
2022-09-06T10:36:10+03:00
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0b43b18 (Manifest_cache true)
=======
=======
>>>>>>> 9ec6862 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 039806b (Add login registration pages)
=======
=======
=======
Generated
2022-09-05T19:21:30+03:00
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 2ee03d3 (Featire specs)
=======
=======
=======
Generated
2022-09-06T10:36:10+03:00
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 24b58e6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> caaaa41 (Manifest_cache true)
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
=======
=======
Generated
2022-09-06T17:39:47+03:00
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 57a2e05 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 45f9f35 (Add login registration pages)
=======
=======
=======
Generated
2022-09-05T19:21:30+03:00
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5506bd0 (Featire specs)
=======
=======
=======
Generated
2022-09-06T10:36:10+03:00
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 00f8b58 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8874887 (Manifest_cache true)
=======
=======
=======
Generated
2022-09-06T11:37:55+03:00
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
=======
=======
Generated
2022-09-06T17:39:47+03:00
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> cacbab9 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 697ad44 (Add login registration pages)
=======
=======
Generated
2022-10-06T18:33:49+03:00
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
>>>>>>> 078304c (Rebased)
=======
=======
Generated
2022-10-06T18:57:15+03:00
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> d15fe1d (Fix)
=======
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
Generated
2022-10-06T18:57:15+03:00
=======
Generated
2022-09-05T19:21:30+03:00
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> b4763a2 (Featire specs)
=======
=======
=======
Generated
2022-09-06T10:36:10+03:00
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> dcf74e1 (Manifest_cache true)
=======
=======
=======
Generated
2022-09-06T11:37:55+03:00
=======
Generated
2022-09-06T10:36:10+03:00
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d66884b (Manifest_cache true)
=======
=======
=======
Generated
2022-09-05T19:21:30+03:00
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> bcd09ab (Featire specs)
=======
=======
=======
Generated
2022-09-06T10:36:10+03:00
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 022e63e (Manifest_cache true)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> c006a44 (Featire specs)
=======
=======
=======
Generated
2022-09-06T10:36:10+03:00
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 10bdfea (Manifest_cache true)
=======
=======
>>>>>>> f182ac7 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 0fc3bf0 (Add login registration pages)
=======
=======
=======
Generated
2022-09-05T19:21:30+03:00
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 848bfa2 (Featire specs)
=======
=======
=======
Generated
2022-09-06T10:36:10+03:00
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d70f030 (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
=======
=======
Generated
2022-09-06T17:39:47+03:00
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 57da3ff (Add login registration pages)
<<<<<<< HEAD
>>>>>>> af9487a (Add login registration pages)
=======
=======
=======
Generated
2022-09-05T19:21:30+03:00
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9ca3b84 (Featire specs)
=======
=======
=======
Generated
2022-09-06T10:36:10+03:00
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> cae047f (Manifest_cache true)
=======
=======
=======
Generated
2022-09-06T11:37:55+03:00
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
=======
=======
Generated
2022-09-06T17:39:47+03:00
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> a624084 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 140c987 (Add login registration pages)
=======
=======
=======
Generated
2022-09-05T19:21:30+03:00
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> fefbd35 (Featire specs)
=======
=======
=======
Generated
2022-09-06T10:36:10+03:00
>>>>>>> 998f08d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a9e654b (Manifest_cache true)
=======
=======
=======
Generated
2022-09-06T11:37:55+03:00
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
=======
=======
Generated
2022-09-06T17:39:47+03:00
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 6a9fede (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 0c3a150 (Add login registration pages)
=======
=======
Generated
2022-10-07T13:29:03+03:00
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
>>>>>>> 0b5b269 (Fix)
=======
=======
Generated
2022-10-07T13:38:31+03:00
>>>>>>> 446d79a (Fix)
<<<<<<< HEAD
>>>>>>> 8ad6192 (Fix)
=======
=======
=======
>>>>>>> 866aee4 (Manifest_cache true)
=======
>>>>>>> 4e7b845 (Manifest_cache true)
Generated
2022-10-07T13:38:31+03:00
=======
Generated
2022-09-05T19:21:30+03:00
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9dc109d (Featire specs)
<<<<<<< HEAD
>>>>>>> d6f7da8 (Featire specs)
=======
=======
=======
Generated
2022-09-06T10:36:10+03:00
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 866aee4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> ab67c96 (Manifest_cache true)
=======
=======
=======
Generated
2022-09-06T11:37:55+03:00
=======
Generated
2022-09-06T10:36:10+03:00
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 4e7b845 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4e0a8d9 (Manifest_cache true)
=======
=======
=======
Generated
2022-09-05T19:21:30+03:00
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
>>>>>>> f5da5ac (Featire specs)
=======
=======
=======
Generated
2022-09-06T10:36:10+03:00
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> b5f64c6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 036bb32 (Manifest_cache true)
=======
=======
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5f79779 (Featire specs)
=======
=======
>>>>>>> e965665 (Manifest_cache true)
=======
=======
Generated
2022-09-06T10:36:10+03:00
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 8c7bad7 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3e8974a (Manifest_cache true)
=======
=======
>>>>>>> 0005d4a (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 282f108 (Add login registration pages)
=======
=======
>>>>>>> ea0650c (Featire specs)
=======
=======
Generated
2022-09-05T19:21:30+03:00
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 56a05fb (Featire specs)
=======
=======
>>>>>>> 10b6c72 (Manifest_cache true)
=======
=======
Generated
2022-09-06T10:36:10+03:00
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 1bfc7a6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 23e9df9 (Manifest_cache true)
=======
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> da83d1a (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> b26425c (Add login registration pages)
=======
=======
Generated
2022-09-06T17:39:47+03:00
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 58d403b (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> db0e854 (Add login registration pages)
=======
=======
>>>>>>> a038b16 (Featire specs)
=======
=======
Generated
2022-09-05T19:21:30+03:00
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6d21330 (Featire specs)
=======
=======
>>>>>>> a77cc8a (Manifest_cache true)
=======
=======
Generated
2022-09-06T10:36:10+03:00
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 3b839af (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9617beb (Manifest_cache true)
=======
=======
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
=======
=======
Generated
2022-09-06T11:37:55+03:00
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2a431e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 845289f (Add login registration pages)
=======
=======
Generated
2022-09-06T17:39:47+03:00
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> b575a28 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 2cdd6f4 (Add login registration pages)
=======
=======
>>>>>>> d7fadcd (Featire specs)
=======
=======
Generated
2022-09-05T19:21:30+03:00
>>>>>>> 4552227 (Featire specs)
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 27e3351 (Featire specs)
=======
=======
>>>>>>> 39467b5 (Manifest_cache true)
=======
=======
Generated
2022-09-06T10:36:10+03:00
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> 0832698 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b40a04e (Manifest_cache true)
=======
=======
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
=======
=======
Generated
2022-09-06T11:37:55+03:00
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e733663 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 569a007 (Add login registration pages)
=======
=======
Generated
2022-09-06T17:39:47+03:00
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 5caffae (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3a43955 (Add login registration pages)
=======
=======
Generated
2022-10-07T16:34:44+03:00
>>>>>>> 8f1bc14 (Fix)
<<<<<<< HEAD
>>>>>>> 1ac6be1 (Fix)
=======
Generated
2022-09-06T10:36:10+03:00
>>>>>>> cde4834 (Manifest_cache true)
=======
=======
Generated
2022-09-05T19:21:30+03:00
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> 3dc272d (Featire specs)
=======
=======
=======
Generated
2022-09-06T10:36:10+03:00
>>>>>>> 183b6c5 (Manifest_cache true)
=======
Generated
2022-09-06T11:37:55+03:00
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 22ee41c (Add login registration pages)
>>>>>>> 27ceb6f (Add login registration pages)
=======
=======
Generated
2022-10-06T17:07:21+03:00
>>>>>>> c033601 (Rebased)
>>>>>>> 1577aeb (Rebased)
=======
=======
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
>>>>>>> 6fa625b (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> c8cdb08 (Manifest_cache true)
Generated
2022-10-06T17:07:21+03:00
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
Generated
2022-10-06T18:57:15+03:00
>>>>>>> 59d75f9 (Featire specs)
=======
=======
>>>>>>> b5f64c6 (Manifest_cache true)
Generated
2022-10-07T13:38:31+03:00
>>>>>>> 864f339 (Featire specs)
=======
Generated
2022-09-05T19:21:30+03:00
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 8c32a77 (Featire specs)
=======
=======
=======
Generated
2022-09-06T10:36:10+03:00
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b9cc4e9 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 902b803 (Manifest_cache true)
=======
=======
=======
Generated
2022-09-06T11:37:55+03:00
=======
Generated
2022-09-06T10:36:10+03:00
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6fa625b (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0c9131d (Manifest_cache true)
=======
=======
=======
Generated
2022-09-05T19:21:30+03:00
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 56ef3ac (Featire specs)
=======
=======
=======
Generated
2022-09-06T10:36:10+03:00
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> c8cdb08 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b763f5b (Manifest_cache true)
=======
=======
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 113da87 (Featire specs)
=======
=======
=======
Generated
2022-09-06T10:36:10+03:00
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> be2f578 (Manifest_cache true)
=======
=======
>>>>>>> 9ec6862 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 2471c87 (Add login registration pages)
=======
=======
=======
Generated
2022-09-05T19:21:30+03:00
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 8b420cf (Featire specs)
=======
=======
=======
Generated
2022-09-06T10:36:10+03:00
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 24b58e6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> ed97c39 (Manifest_cache true)
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
=======
Generated
2022-09-06T17:39:47+03:00
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 57a2e05 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 65459e8 (Add login registration pages)
=======
=======
=======
Generated
2022-09-05T19:21:30+03:00
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 20256f8 (Featire specs)
=======
=======
=======
Generated
2022-09-06T10:36:10+03:00
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 00f8b58 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 587ce47 (Manifest_cache true)
=======
=======
=======
Generated
2022-09-06T11:37:55+03:00
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
=======
=======
Generated
2022-09-06T17:39:47+03:00
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> cacbab9 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> cb955a0 (Add login registration pages)
=======
=======
Generated
2022-10-06T18:33:49+03:00
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
>>>>>>> bebaea7 (Rebased)
=======
=======
Generated
2022-10-06T18:57:15+03:00
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> eaef86a (Fix)
=======
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
Generated
2022-10-06T18:57:15+03:00
=======
Generated
2022-09-05T19:21:30+03:00
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> b35d1f8 (Featire specs)
=======
=======
=======
Generated
2022-09-06T10:36:10+03:00
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 5518ff0 (Manifest_cache true)
=======
=======
=======
Generated
2022-09-06T11:37:55+03:00
=======
Generated
2022-09-06T10:36:10+03:00
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 75be480 (Manifest_cache true)
=======
=======
=======
Generated
2022-09-05T19:21:30+03:00
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> a1fe6da (Featire specs)
=======
=======
=======
Generated
2022-09-06T10:36:10+03:00
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 027f794 (Manifest_cache true)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 28fed3c (Featire specs)
=======
=======
=======
Generated
2022-09-06T10:36:10+03:00
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e2bfd89 (Manifest_cache true)
=======
=======
>>>>>>> f182ac7 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> aeec696 (Add login registration pages)
=======
=======
=======
Generated
2022-09-05T19:21:30+03:00
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ed6aebd (Featire specs)
=======
=======
=======
Generated
2022-09-06T10:36:10+03:00
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d1bae53 (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
=======
=======
Generated
2022-09-06T17:39:47+03:00
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 57da3ff (Add login registration pages)
<<<<<<< HEAD
>>>>>>> b5affcb (Add login registration pages)
=======
=======
=======
Generated
2022-09-05T19:21:30+03:00
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> 64d4167 (Featire specs)
=======
=======
=======
Generated
2022-09-06T10:36:10+03:00
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 35d9b13 (Manifest_cache true)
=======
=======
=======
Generated
2022-09-06T11:37:55+03:00
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
=======
=======
Generated
2022-09-06T17:39:47+03:00
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> a624084 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 4f7c979 (Add login registration pages)
=======
=======
=======
Generated
2022-09-05T19:21:30+03:00
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 13fd74f (Featire specs)
=======
=======
=======
Generated
2022-09-06T10:36:10+03:00
>>>>>>> 998f08d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7f7abc (Manifest_cache true)
=======
=======
=======
Generated
2022-09-06T11:37:55+03:00
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
=======
=======
Generated
2022-09-06T17:39:47+03:00
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 6a9fede (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 60943cc (Add login registration pages)
=======
=======
Generated
2022-10-07T13:29:03+03:00
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
>>>>>>> 1a9aba9 (Fix)
=======
=======
Generated
2022-10-07T13:38:31+03:00
>>>>>>> 446d79a (Fix)
<<<<<<< HEAD
>>>>>>> 4f1a459 (Fix)
=======
=======
=======
>>>>>>> 866aee4 (Manifest_cache true)
=======
>>>>>>> 4e7b845 (Manifest_cache true)
Generated
2022-10-07T13:38:31+03:00
=======
Generated
2022-09-05T19:21:30+03:00
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9dc109d (Featire specs)
<<<<<<< HEAD
>>>>>>> dacfb20 (Featire specs)
=======
=======
=======
Generated
2022-09-06T10:36:10+03:00
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 866aee4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 459d812 (Manifest_cache true)
=======
=======
=======
Generated
2022-09-06T11:37:55+03:00
=======
Generated
2022-09-06T10:36:10+03:00
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 4e7b845 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 3fef583 (Manifest_cache true)
=======
=======
=======
Generated
2022-09-05T19:21:30+03:00
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
>>>>>>> 93db8b1 (Featire specs)
=======
=======
=======
Generated
2022-09-06T10:36:10+03:00
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> b5f64c6 (Manifest_cache true)
>>>>>>> b746b60 (Manifest_cache true)
=======
=======
>>>>>>> a2de409 (Featire specs)
>>>>>>> 5f76842 (Featire specs)
=======
>>>>>>> e965665 (Manifest_cache true)
=======
=======
>>>>>>> 0005d4a (Add login registration pages)
>>>>>>> 01d9256 (Add login registration pages)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> 10b6c72 (Manifest_cache true)
=======
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
=======
>>>>>>> b26425c (Add login registration pages)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> a77cc8a (Manifest_cache true)
=======
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 845289f (Add login registration pages)
=======
>>>>>>> d7fadcd (Featire specs)
=======
>>>>>>> 39467b5 (Manifest_cache true)
=======
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 569a007 (Add login registration pages)
=======
=======
Generated
2022-10-07T16:34:44+03:00
>>>>>>> 8f1bc14 (Fix)
>>>>>>> 49e3b70 (Fix)
=======
=======
=======
>>>>>>> e991554 (Manifest_cache true)
=======
>>>>>>> b8aab1a (Manifest_cache true)
Generated
2022-10-07T16:34:44+03:00
=======
Generated
2022-09-05T19:21:30+03:00
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 65f3409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 78d0719 (Featire specs)
=======
=======
=======
Generated
2022-09-06T10:36:10+03:00
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e991554 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 6edce20 (Manifest_cache true)
=======
=======
=======
Generated
2022-09-06T11:37:55+03:00
=======
Generated
2022-09-06T10:36:10+03:00
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> b8aab1a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 04108c4 (Manifest_cache true)
=======
=======
=======
Generated
2022-09-05T19:21:30+03:00
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> c1749d5 (Featire specs)
<<<<<<< HEAD
>>>>>>> f861b82 (Featire specs)
=======
=======
=======
Generated
2022-09-06T10:36:10+03:00
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> 3c386ca (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d8298a1 (Manifest_cache true)
=======
=======
>>>>>>> 1cb2e82 (Featire specs)
<<<<<<< HEAD
>>>>>>> 2fd2048 (Featire specs)
=======
=======
=======
Generated
2022-09-06T10:36:10+03:00
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> fe7e312 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> bdea3aa (Manifest_cache true)
=======
=======
>>>>>>> fb10fe4 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 591c3b2 (Add login registration pages)
=======
=======
=======
Generated
2022-09-05T19:21:30+03:00
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 8577deb (Featire specs)
<<<<<<< HEAD
>>>>>>> bc0ff2c (Featire specs)
=======
=======
=======
Generated
2022-09-06T10:36:10+03:00
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 94d9078 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 07682bd (Manifest_cache true)
=======
=======
>>>>>>> 7b112c2 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 45f6de0 (Fix book_spec decrease quantity and price)
=======
=======
=======
Generated
2022-09-06T17:39:47+03:00
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 69eb97e (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 055b00f (Add login registration pages)
=======
=======
=======
Generated
2022-09-05T19:21:30+03:00
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> ebe5361 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9bf2aae (Featire specs)
=======
=======
=======
Generated
2022-09-06T10:36:10+03:00
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 2956182 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e2d040a (Manifest_cache true)
=======
=======
=======
Generated
2022-09-06T11:37:55+03:00
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> a455e8a (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 7718476 (Fix book_spec decrease quantity and price)
=======
=======
=======
Generated
2022-09-06T17:39:47+03:00
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 089f8cf (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e7ec208 (Add login registration pages)
=======
=======
=======
Generated
2022-09-05T19:21:30+03:00
>>>>>>> 4552227 (Featire specs)
>>>>>>> d3d58e0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5ce1a6d (Featire specs)
=======
=======
=======
Generated
2022-09-06T10:36:10+03:00
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> 9d9ff14 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 307ac6e (Manifest_cache true)
=======
=======
=======
Generated
2022-09-06T11:37:55+03:00
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 59078f6 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> cea736b (Fix book_spec decrease quantity and price)
=======
=======
=======
Generated
2022-09-06T17:39:47+03:00
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 0edd9b7 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 61908af (Add login registration pages)
=======
=======
Generated
2022-10-09T15:09:44+03:00
>>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
<<<<<<< HEAD
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
=======
=======
Generated
2022-10-12T13:22:27+03:00
>>>>>>> 708d0c9 (Checkout Add CreditCard Address Delivery method)
<<<<<<< HEAD
>>>>>>> 081d138 (Checkout Add CreditCard Address Delivery method)
=======
=======
Generated
2022-10-17T14:15:31+03:00
>>>>>>> 25f3c50 (Add sort orders)
>>>>>>> aa4fb26 (Add sort orders)
All Files
(
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 078304c (Rebased)
=======
>>>>>>> d15fe1d (Fix)
=======
>>>>>>> bebaea7 (Rebased)
=======
>>>>>>> eaef86a (Fix)
=======
>>>>>>> 081d138 (Checkout Add CreditCard Address Delivery method)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 7945032 (Manifest_cache true)
=======
>>>>>>> 0bdcc5e (Manifest_cache true)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> b00b319 (Manifest_cache true)
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
>>>>>>> cb74525 (Add login registration pages)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> b459807 (Manifest_cache true)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8be9029 (Add login registration pages)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7d58507 (Add login registration pages)
=======
>>>>>>> e9f3851 (Manifest_cache true)
=======
>>>>>>> 307f31f (Manifest_cache true)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> d782a28 (Manifest_cache true)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 35d17b9 (Manifest_cache true)
=======
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> add330c (Manifest_cache true)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> 551f3c1 (Add login registration pages)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 15bff2e (Manifest_cache true)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> ccec311 (Add login registration pages)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> 6c71f00 (Manifest_cache true)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8c3e531 (Add login registration pages)
=======
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> 851b4c0 (Fix)
=======
>>>>>>> 0b5b269 (Fix)
=======
>>>>>>> 8ad6192 (Fix)
=======
>>>>>>> d6f7da8 (Featire specs)
=======
>>>>>>> ab67c96 (Manifest_cache true)
=======
>>>>>>> 4e0a8d9 (Manifest_cache true)
=======
>>>>>>> f5da5ac (Featire specs)
=======
>>>>>>> 036bb32 (Manifest_cache true)
=======
>>>>>>> 5f79779 (Featire specs)
=======
=======
>>>>>>> 282f108 (Add login registration pages)
=======
>>>>>>> 56a05fb (Featire specs)
=======
>>>>>>> 23e9df9 (Manifest_cache true)
=======
>>>>>>> da83d1a (Fix book_spec decrease quantity and price)
=======
>>>>>>> db0e854 (Add login registration pages)
=======
>>>>>>> 6d21330 (Featire specs)
=======
>>>>>>> 9617beb (Manifest_cache true)
=======
>>>>>>> a2a431e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2cdd6f4 (Add login registration pages)
=======
>>>>>>> 27e3351 (Featire specs)
=======
>>>>>>> b40a04e (Manifest_cache true)
=======
>>>>>>> e733663 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3a43955 (Add login registration pages)
=======
>>>>>>> 1ac6be1 (Fix)
=======
>>>>>>> 49e3b70 (Fix)
=======
>>>>>>> 78d0719 (Featire specs)
=======
>>>>>>> 6edce20 (Manifest_cache true)
=======
>>>>>>> 04108c4 (Manifest_cache true)
=======
>>>>>>> f861b82 (Featire specs)
=======
>>>>>>> d8298a1 (Manifest_cache true)
=======
>>>>>>> 2fd2048 (Featire specs)
=======
=======
>>>>>>> 591c3b2 (Add login registration pages)
=======
>>>>>>> bc0ff2c (Featire specs)
=======
>>>>>>> 07682bd (Manifest_cache true)
=======
>>>>>>> 45f6de0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 055b00f (Add login registration pages)
=======
>>>>>>> 9bf2aae (Featire specs)
=======
>>>>>>> e2d040a (Manifest_cache true)
=======
>>>>>>> 7718476 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e7ec208 (Add login registration pages)
=======
>>>>>>> 5ce1a6d (Featire specs)
=======
>>>>>>> 307ac6e (Manifest_cache true)
=======
>>>>>>> cea736b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 61908af (Add login registration pages)
=======
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
=======
=======
>>>>>>> fb10fe4 (Add login registration pages)
=======
>>>>>>> 8577deb (Featire specs)
=======
>>>>>>> 94d9078 (Manifest_cache true)
=======
>>>>>>> 7b112c2 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 69eb97e (Add login registration pages)
=======
>>>>>>> ebe5361 (Featire specs)
=======
>>>>>>> 2956182 (Manifest_cache true)
=======
>>>>>>> a455e8a (Fix book_spec decrease quantity and price)
=======
>>>>>>> 089f8cf (Add login registration pages)
=======
>>>>>>> d3d58e0 (Featire specs)
=======
>>>>>>> 9d9ff14 (Manifest_cache true)
=======
>>>>>>> 59078f6 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0edd9b7 (Add login registration pages)
93.06%
>>>>>>> fe7e312 (Manifest_cache true)
>>>>>>> bdea3aa (Manifest_cache true)
=======
=======
>>>>>>> 0005d4a (Add login registration pages)
=======
>>>>>>> e54ceb0 (Featire specs)
=======
>>>>>>> 1bfc7a6 (Manifest_cache true)
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 58d403b (Add login registration pages)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
>>>>>>> 3b839af (Manifest_cache true)
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
=======
>>>>>>> b575a28 (Add login registration pages)
=======
>>>>>>> 5a0bcc7 (Featire specs)
=======
>>>>>>> 0832698 (Manifest_cache true)
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5caffae (Add login registration pages)
95.44%
>>>>>>> 8c7bad7 (Manifest_cache true)
>>>>>>> 3e8974a (Manifest_cache true)
=======
>>>>>>> 1a9aba9 (Fix)
=======
>>>>>>> 4f1a459 (Fix)
=======
>>>>>>> dacfb20 (Featire specs)
=======
>>>>>>> 459d812 (Manifest_cache true)
=======
>>>>>>> 3fef583 (Manifest_cache true)
=======
>>>>>>> 93db8b1 (Featire specs)
=======
>>>>>>> b746b60 (Manifest_cache true)
=======
>>>>>>> 5f76842 (Featire specs)
=======
=======
>>>>>>> 01d9256 (Add login registration pages)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> 10b6c72 (Manifest_cache true)
=======
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
=======
>>>>>>> b26425c (Add login registration pages)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> a77cc8a (Manifest_cache true)
=======
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 845289f (Add login registration pages)
=======
>>>>>>> d7fadcd (Featire specs)
=======
>>>>>>> 39467b5 (Manifest_cache true)
=======
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 569a007 (Add login registration pages)
=======
=======
>>>>>>> 0005d4a (Add login registration pages)
=======
>>>>>>> e54ceb0 (Featire specs)
=======
>>>>>>> 1bfc7a6 (Manifest_cache true)
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 58d403b (Add login registration pages)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
>>>>>>> 3b839af (Manifest_cache true)
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
=======
>>>>>>> b575a28 (Add login registration pages)
=======
>>>>>>> 5a0bcc7 (Featire specs)
=======
>>>>>>> 0832698 (Manifest_cache true)
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5caffae (Add login registration pages)
95.44%
>>>>>>> 8c7bad7 (Manifest_cache true)
>>>>>>> e965665 (Manifest_cache true)
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a624084 (Add login registration pages)
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> b15044a (Manifest_cache true)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6a9fede (Add login registration pages)
95.79%
>>>>>>> f182ac7 (Add login registration pages)
>>>>>>> 852864e (Add login registration pages)
=======
>>>>>>> dcf74e1 (Manifest_cache true)
=======
>>>>>>> d66884b (Manifest_cache true)
=======
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> 022e63e (Manifest_cache true)
=======
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 10bdfea (Manifest_cache true)
=======
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> d70f030 (Manifest_cache true)
=======
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
>>>>>>> af9487a (Add login registration pages)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> cae047f (Manifest_cache true)
=======
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 140c987 (Add login registration pages)
=======
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> a9e654b (Manifest_cache true)
=======
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0c3a150 (Add login registration pages)
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a624084 (Add login registration pages)
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> b15044a (Manifest_cache true)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6a9fede (Add login registration pages)
95.79%
>>>>>>> f182ac7 (Add login registration pages)
>>>>>>> 0fc3bf0 (Add login registration pages)
=======
>>>>>>> 5518ff0 (Manifest_cache true)
=======
>>>>>>> 75be480 (Manifest_cache true)
=======
>>>>>>> a1fe6da (Featire specs)
=======
>>>>>>> 027f794 (Manifest_cache true)
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> e2bfd89 (Manifest_cache true)
=======
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> d1bae53 (Manifest_cache true)
=======
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
>>>>>>> b5affcb (Add login registration pages)
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> 35d9b13 (Manifest_cache true)
=======
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4f7c979 (Add login registration pages)
=======
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> f7f7abc (Manifest_cache true)
=======
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
>>>>>>> 60943cc (Add login registration pages)
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a624084 (Add login registration pages)
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> b15044a (Manifest_cache true)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6a9fede (Add login registration pages)
95.79%
>>>>>>> f182ac7 (Add login registration pages)
>>>>>>> aeec696 (Add login registration pages)
=======
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
>>>>>>> 9ec6862 (Add login registration pages)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
>>>>>>> cacbab9 (Add login registration pages)
95.71%
>>>>>>> b832d45 (Featire specs)
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 9bebee5 (Manifest_cache true)
=======
>>>>>>> ee5935f (Manifest_cache true)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 394c6f3 (Manifest_cache true)
=======
=======
>>>>>>> 0b43b18 (Manifest_cache true)
=======
>>>>>>> 039806b (Add login registration pages)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> caaaa41 (Manifest_cache true)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 45f9f35 (Add login registration pages)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> 8874887 (Manifest_cache true)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 697ad44 (Add login registration pages)
=======
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
>>>>>>> 9ec6862 (Add login registration pages)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
>>>>>>> cacbab9 (Add login registration pages)
95.71%
>>>>>>> b832d45 (Featire specs)
>>>>>>> 5be567f (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d780a52 (Rebased)
=======
>>>>>>> 83979de (Featire specs)
=======
>>>>>>> d0f5c14 (Manifest_cache true)
=======
>>>>>>> cfd1f7f (Manifest_cache true)
=======
>>>>>>> b3f2049 (Featire specs)
=======
>>>>>>> e031bce (Manifest_cache true)
=======
=======
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 02ba384 (Manifest_cache true)
=======
=======
>>>>>>> 9ec6862 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 264ef06 (Add login registration pages)
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3e35e (Featire specs)
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 926dfe5 (Manifest_cache true)
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c54769d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 57a2e05 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> a1a8477 (Add login registration pages)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 1677b1a (Featire specs)
=======
=======
>>>>>>> 00f8b58 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1830ff1 (Manifest_cache true)
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c346782 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> cacbab9 (Add login registration pages)
>>>>>>> 551615f (Add login registration pages)
95.71%
>>>>>>> b832d45 (Featire specs)
>>>>>>> 12bcf81 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> d96cf3b (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 715fac2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> d96cf3b (Featire specs)
=======
=======
>>>>>>> b6a32ab (Add login registration pages)
=======
>>>>>>> e50f73e (Add login registration pages)
=======
>>>>>>> 03c0867 (Add login registration pages)
>>>>>>> 5c33a07 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f764a87 (Fix book_spec decrease quantity and price)
=======
=======
<<<<<<< HEAD
>>>>>>> 22ee41c (Add login registration pages)
>>>>>>> b6a32ab (Add login registration pages)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
=======
<<<<<<< HEAD
>>>>>>> 22ee41c (Add login registration pages)
>>>>>>> e50f73e (Add login registration pages)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
=======
<<<<<<< HEAD
>>>>>>> 22ee41c (Add login registration pages)
>>>>>>> 03c0867 (Add login registration pages)
=======
=======
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 902b803 (Manifest_cache true)
=======
>>>>>>> 0c9131d (Manifest_cache true)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> b763f5b (Manifest_cache true)
=======
=======
>>>>>>> be2f578 (Manifest_cache true)
=======
>>>>>>> 2471c87 (Add login registration pages)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> ed97c39 (Manifest_cache true)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 65459e8 (Add login registration pages)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 587ce47 (Manifest_cache true)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
>>>>>>> cb955a0 (Add login registration pages)
=======
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
>>>>>>> 9ec6862 (Add login registration pages)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
>>>>>>> cacbab9 (Add login registration pages)
95.71%
>>>>>>> b832d45 (Featire specs)
>>>>>>> 113da87 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> 3dc272d (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
=======
=======
<<<<<<< HEAD
>>>>>>> 22ee41c (Add login registration pages)
>>>>>>> 27ceb6f (Add login registration pages)
90.68%
=======
<<<<<<< HEAD
99.2%
=======
90.68%
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d96cf3b (Featire specs)
=======
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> 3dc272d (Featire specs)
=======
99.11%
>>>>>>> 752f0c0 (Featire specs)
=======
90.68%
>>>>>>> bd8bda4 (Manifest_cache true)
=======
99.11%
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 0b43b18 (Manifest_cache true)
=======
>>>>>>> 3e8974a (Manifest_cache true)
=======
>>>>>>> 3dc272d (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> be2f578 (Manifest_cache true)
=======
>>>>>>> e965665 (Manifest_cache true)
=======
>>>>>>> bdea3aa (Manifest_cache true)
=======
90.68%
>>>>>>> aa7b40c (Manifest_cache true)
=======
99.25%
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> cb74525 (Add login registration pages)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 852864e (Add login registration pages)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 039806b (Add login registration pages)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 0fc3bf0 (Add login registration pages)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> 282f108 (Add login registration pages)
=======
>>>>>>> 56a05fb (Featire specs)
=======
>>>>>>> 2471c87 (Add login registration pages)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> aeec696 (Add login registration pages)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> 01d9256 (Add login registration pages)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> 591c3b2 (Add login registration pages)
=======
>>>>>>> bc0ff2c (Featire specs)
=======
99.11%
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
90.68%
>>>>>>> 183b6c5 (Manifest_cache true)
=======
99.2%
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
95.71%
>>>>>>> aca90e3 (Rebased)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> d96cf3b (Featire specs)
=======
=======
>>>>>>> 926dfe5 (Manifest_cache true)
=======
>>>>>>> b459807 (Manifest_cache true)
=======
>>>>>>> add330c (Manifest_cache true)
=======
>>>>>>> caaaa41 (Manifest_cache true)
=======
>>>>>>> d70f030 (Manifest_cache true)
=======
>>>>>>> 23e9df9 (Manifest_cache true)
=======
>>>>>>> ed97c39 (Manifest_cache true)
=======
>>>>>>> d1bae53 (Manifest_cache true)
=======
>>>>>>> 10b6c72 (Manifest_cache true)
=======
>>>>>>> 07682bd (Manifest_cache true)
>>>>>>> 5c33a07 (Featire specs)
=======
=======
90.68%
>>>>>>> 183b6c5 (Manifest_cache true)
=======
99.2%
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8be9029 (Add login registration pages)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> 551f3c1 (Add login registration pages)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 45f9f35 (Add login registration pages)
=======
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
>>>>>>> af9487a (Add login registration pages)
=======
>>>>>>> da83d1a (Fix book_spec decrease quantity and price)
=======
>>>>>>> db0e854 (Add login registration pages)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 65459e8 (Add login registration pages)
=======
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
>>>>>>> b5affcb (Add login registration pages)
=======
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
=======
>>>>>>> b26425c (Add login registration pages)
=======
>>>>>>> 45f6de0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 055b00f (Add login registration pages)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> f764a87 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> e50f73e (Add login registration pages)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 03c0867 (Add login registration pages)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 27ceb6f (Add login registration pages)
=======
=======
99.25%
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> 6d21330 (Featire specs)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> 9bf2aae (Featire specs)
>>>>>>> 22ee41c (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b6a32ab (Add login registration pages)
=======
=======
95.71%
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d780a52 (Rebased)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
>>>>>>> 6fa625b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> c8cdb08 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
>>>>>>> 7945032 (Manifest_cache true)
=======
>>>>>>> 0bdcc5e (Manifest_cache true)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> b00b319 (Manifest_cache true)
=======
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
>>>>>>> 9bebee5 (Manifest_cache true)
=======
>>>>>>> ee5935f (Manifest_cache true)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 394c6f3 (Manifest_cache true)
95.71%
=======
=======
>>>>>>> b5f64c6 (Manifest_cache true)
=======
>>>>>>> a2de409 (Featire specs)
95.44%
>>>>>>> 864f339 (Featire specs)
=======
99.11%
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 83979de (Featire specs)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 7945032 (Manifest_cache true)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 9bebee5 (Manifest_cache true)
=======
=======
90.68%
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b9cc4e9 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d0f5c14 (Manifest_cache true)
=======
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
>>>>>>> 0bdcc5e (Manifest_cache true)
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
>>>>>>> ee5935f (Manifest_cache true)
=======
=======
99.2%
=======
90.68%
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f5da5ac (Featire specs)
>>>>>>> 6fa625b (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> cfd1f7f (Manifest_cache true)
=======
=======
>>>>>>> 6fa625b (Manifest_cache true)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 6fa625b (Manifest_cache true)
>>>>>>> 3e9f99d (Featire specs)
=======
=======
99.11%
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 036bb32 (Manifest_cache true)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> b00b319 (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 394c6f3 (Manifest_cache true)
=======
=======
90.68%
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> c8cdb08 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e031bce (Manifest_cache true)
=======
=======
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 12bcf81 (Featire specs)
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
>>>>>>> 0b43b18 (Manifest_cache true)
=======
=======
90.68%
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 02ba384 (Manifest_cache true)
=======
=======
>>>>>>> 9ec6862 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 264ef06 (Add login registration pages)
=======
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
=======
99.11%
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fd3e35e (Featire specs)
=======
=======
>>>>>>> b459807 (Manifest_cache true)
=======
>>>>>>> caaaa41 (Manifest_cache true)
=======
=======
90.68%
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 24b58e6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 926dfe5 (Manifest_cache true)
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c54769d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 8be9029 (Add login registration pages)
=======
>>>>>>> 45f9f35 (Add login registration pages)
=======
=======
99.25%
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 57a2e05 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a1a8477 (Add login registration pages)
=======
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
=======
99.11%
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 15bff2e (Manifest_cache true)
=======
>>>>>>> cae047f (Manifest_cache true)
=======
>>>>>>> 9617beb (Manifest_cache true)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 1677b1a (Featire specs)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 8874887 (Manifest_cache true)
=======
=======
90.68%
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a2a431e (Fix book_spec decrease quantity and price)
>>>>>>> 00f8b58 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1830ff1 (Manifest_cache true)
=======
=======
>>>>>>> 00f8b58 (Manifest_cache true)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 00f8b58 (Manifest_cache true)
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
=======
99.2%
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ccec311 (Add login registration pages)
=======
>>>>>>> 140c987 (Add login registration pages)
=======
>>>>>>> 2cdd6f4 (Add login registration pages)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c346782 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 7d58507 (Add login registration pages)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 697ad44 (Add login registration pages)
=======
=======
99.25%
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> 27e3351 (Featire specs)
>>>>>>> cacbab9 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 551615f (Add login registration pages)
=======
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 078304c (Rebased)
=======
69.46%
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d52ad35 (Rebased)
=======
=======
>>>>>>> 872e675 (Fix)
=======
<<<<<<< HEAD
95.79%
<<<<<<< HEAD
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
=======
=======
99.11%
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
=======
=======
=======
90.68%
>>>>>>> 183b6c5 (Manifest_cache true)
=======
99.2%
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> 22ee41c (Add login registration pages)
>>>>>>> e50f73e (Add login registration pages)
=======
=======
95.71%
>>>>>>> c033601 (Rebased)
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
>>>>>>> 7945032 (Manifest_cache true)
=======
>>>>>>> 6fa625b (Manifest_cache true)
>>>>>>> 0bdcc5e (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> b00b319 (Manifest_cache true)
=======
=======
>>>>>>> b832d45 (Featire specs)
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
=======
>>>>>>> 9ec6862 (Add login registration pages)
>>>>>>> cb74525 (Add login registration pages)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> b459807 (Manifest_cache true)
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8be9029 (Add login registration pages)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 00f8b58 (Manifest_cache true)
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7d58507 (Add login registration pages)
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 872e675 (Fix)
=======
=======
=======
99.11%
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
=======
>>>>>>> dcf74e1 (Manifest_cache true)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> d66884b (Manifest_cache true)
=======
>>>>>>> bcd09ab (Featire specs)
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
>>>>>>> 022e63e (Manifest_cache true)
=======
>>>>>>> c006a44 (Featire specs)
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
>>>>>>> 10bdfea (Manifest_cache true)
95.79%
=======
95.44%
>>>>>>> 4e7b845 (Manifest_cache true)
=======
99.11%
>>>>>>> d0dc1f1 (Featire specs)
=======
90.68%
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4e0a8d9 (Manifest_cache true)
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> d66884b (Manifest_cache true)
=======
=======
>>>>>>> 4e7b845 (Manifest_cache true)
=======
99.2%
=======
90.68%
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4e0a8d9 (Manifest_cache true)
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> bcd09ab (Featire specs)
=======
=======
99.11%
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
>>>>>>> 022e63e (Manifest_cache true)
=======
=======
90.68%
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
>>>>>>> c006a44 (Featire specs)
=======
=======
99.11%
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 10bdfea (Manifest_cache true)
=======
=======
90.68%
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 35d17b9 (Manifest_cache true)
=======
=======
>>>>>>> f182ac7 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 852864e (Add login registration pages)
=======
=======
>>>>>>> 848bfa2 (Featire specs)
=======
=======
99.11%
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> d70f030 (Manifest_cache true)
=======
=======
90.68%
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> add330c (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> af9487a (Add login registration pages)
=======
=======
99.25%
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 57da3ff (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 551f3c1 (Add login registration pages)
=======
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
=======
99.11%
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> cae047f (Manifest_cache true)
=======
=======
90.68%
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 15bff2e (Manifest_cache true)
=======
=======
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
=======
99.2%
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 140c987 (Add login registration pages)
=======
=======
99.25%
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> a624084 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ccec311 (Add login registration pages)
=======
=======
>>>>>>> fefbd35 (Featire specs)
=======
=======
99.11%
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b40a04e (Manifest_cache true)
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> a9e654b (Manifest_cache true)
=======
=======
90.68%
>>>>>>> 998f08d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e733663 (Fix book_spec decrease quantity and price)
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 6c71f00 (Manifest_cache true)
=======
=======
>>>>>>> b15044a (Manifest_cache true)
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
=======
99.2%
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 3a43955 (Add login registration pages)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> 0c3a150 (Add login registration pages)
=======
=======
99.25%
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 6a9fede (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8c3e531 (Add login registration pages)
=======
=======
95.74%
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1d59aaa (Fix)
=======
=======
95.44%
>>>>>>> 446d79a (Fix)
<<<<<<< HEAD
>>>>>>> 851b4c0 (Fix)
=======
=======
99.11%
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> 715fac2 (Featire specs)
=======
=======
=======
90.68%
>>>>>>> 183b6c5 (Manifest_cache true)
=======
99.2%
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 22ee41c (Add login registration pages)
>>>>>>> 03c0867 (Add login registration pages)
=======
=======
95.71%
>>>>>>> c033601 (Rebased)
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
>>>>>>> 9bebee5 (Manifest_cache true)
=======
>>>>>>> 6fa625b (Manifest_cache true)
>>>>>>> ee5935f (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 394c6f3 (Manifest_cache true)
=======
=======
>>>>>>> b832d45 (Featire specs)
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 0b43b18 (Manifest_cache true)
=======
=======
>>>>>>> 9ec6862 (Add login registration pages)
>>>>>>> 039806b (Add login registration pages)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> caaaa41 (Manifest_cache true)
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 45f9f35 (Add login registration pages)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> 00f8b58 (Manifest_cache true)
>>>>>>> 8874887 (Manifest_cache true)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> cacbab9 (Add login registration pages)
>>>>>>> 697ad44 (Add login registration pages)
=======
>>>>>>> 078304c (Rebased)
=======
=======
<<<<<<< HEAD
95.79%
<<<<<<< HEAD
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> d15fe1d (Fix)
=======
=======
=======
99.11%
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
>>>>>>> b4763a2 (Featire specs)
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> dcf74e1 (Manifest_cache true)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> d66884b (Manifest_cache true)
=======
>>>>>>> 59d75f9 (Featire specs)
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> 96aecde (Manifest_cache true)
>>>>>>> 022e63e (Manifest_cache true)
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 10bdfea (Manifest_cache true)
=======
=======
>>>>>>> f182ac7 (Add login registration pages)
>>>>>>> 0fc3bf0 (Add login registration pages)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> d70f030 (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
>>>>>>> af9487a (Add login registration pages)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> cae047f (Manifest_cache true)
=======
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 140c987 (Add login registration pages)
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> b15044a (Manifest_cache true)
>>>>>>> a9e654b (Manifest_cache true)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0c3a150 (Add login registration pages)
=======
=======
95.74%
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 0b5b269 (Fix)
=======
=======
95.44%
>>>>>>> 446d79a (Fix)
>>>>>>> 8ad6192 (Fix)
=======
=======
=======
>>>>>>> 866aee4 (Manifest_cache true)
95.44%
=======
99.11%
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9dc109d (Featire specs)
<<<<<<< HEAD
>>>>>>> d6f7da8 (Featire specs)
=======
=======
=======
90.68%
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 866aee4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> ab67c96 (Manifest_cache true)
=======
=======
>>>>>>> 4e7b845 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4e0a8d9 (Manifest_cache true)
=======
=======
=======
99.11%
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
>>>>>>> f5da5ac (Featire specs)
=======
=======
=======
90.68%
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> b5f64c6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 036bb32 (Manifest_cache true)
=======
=======
=======
99.11%
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5f79779 (Featire specs)
=======
=======
=======
90.68%
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 8c7bad7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 3e8974a (Manifest_cache true)
=======
=======
>>>>>>> 0005d4a (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 282f108 (Add login registration pages)
=======
=======
=======
99.11%
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 56a05fb (Featire specs)
=======
=======
=======
90.68%
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 1bfc7a6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 23e9df9 (Manifest_cache true)
=======
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> da83d1a (Fix book_spec decrease quantity and price)
=======
=======
=======
99.25%
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 58d403b (Add login registration pages)
<<<<<<< HEAD
>>>>>>> db0e854 (Add login registration pages)
=======
=======
=======
99.11%
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6d21330 (Featire specs)
=======
=======
=======
90.68%
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 3b839af (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 9617beb (Manifest_cache true)
=======
=======
=======
99.2%
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2a431e (Fix book_spec decrease quantity and price)
=======
=======
=======
99.25%
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> b575a28 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 2cdd6f4 (Add login registration pages)
=======
=======
=======
99.11%
>>>>>>> 4552227 (Featire specs)
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 27e3351 (Featire specs)
=======
=======
=======
90.68%
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> 0832698 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b40a04e (Manifest_cache true)
=======
=======
=======
99.2%
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> e733663 (Fix book_spec decrease quantity and price)
=======
=======
=======
99.25%
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 5caffae (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 3a43955 (Add login registration pages)
=======
=======
93.06%
>>>>>>> 8f1bc14 (Fix)
>>>>>>> 1ac6be1 (Fix)
=======
90.68%
>>>>>>> cde4834 (Manifest_cache true)
=======
=======
99.11%
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> 3dc272d (Featire specs)
=======
=======
=======
90.68%
>>>>>>> 183b6c5 (Manifest_cache true)
=======
99.2%
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 22ee41c (Add login registration pages)
>>>>>>> 27ceb6f (Add login registration pages)
=======
=======
95.71%
>>>>>>> c033601 (Rebased)
>>>>>>> 1577aeb (Rebased)
=======
=======
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
>>>>>>> 6fa625b (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> c8cdb08 (Manifest_cache true)
95.71%
=======
=======
>>>>>>> b5f64c6 (Manifest_cache true)
=======
>>>>>>> a2de409 (Featire specs)
95.44%
>>>>>>> 864f339 (Featire specs)
=======
=======
>>>>>>> 3c386ca (Manifest_cache true)
=======
>>>>>>> 1cb2e82 (Featire specs)
93.06%
>>>>>>> c1749d5 (Featire specs)
=======
99.11%
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 8c32a77 (Featire specs)
=======
=======
=======
90.68%
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b9cc4e9 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 902b803 (Manifest_cache true)
=======
=======
=======
99.2%
=======
90.68%
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6fa625b (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0c9131d (Manifest_cache true)
=======
=======
=======
99.11%
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 56ef3ac (Featire specs)
=======
=======
=======
90.68%
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8cdb08 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b763f5b (Manifest_cache true)
=======
=======
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 113da87 (Featire specs)
=======
=======
=======
90.68%
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> be2f578 (Manifest_cache true)
=======
=======
>>>>>>> 9ec6862 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 2471c87 (Add login registration pages)
=======
=======
=======
99.11%
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 8b420cf (Featire specs)
=======
=======
=======
90.68%
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 24b58e6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> ed97c39 (Manifest_cache true)
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
=======
99.25%
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 57a2e05 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 65459e8 (Add login registration pages)
=======
=======
=======
99.11%
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 20256f8 (Featire specs)
=======
=======
=======
90.68%
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 00f8b58 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 587ce47 (Manifest_cache true)
=======
=======
=======
99.2%
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
=======
=======
99.25%
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> cacbab9 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> cb955a0 (Add login registration pages)
=======
=======
69.46%
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
>>>>>>> bebaea7 (Rebased)
=======
=======
<<<<<<< HEAD
95.79%
<<<<<<< HEAD
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> eaef86a (Fix)
=======
=======
=======
99.11%
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> b35d1f8 (Featire specs)
=======
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> 2722d07 (Manifest_cache true)
95.79%
=======
95.44%
>>>>>>> 4e7b845 (Manifest_cache true)
=======
93.06%
>>>>>>> b8aab1a (Manifest_cache true)
=======
99.11%
>>>>>>> d0dc1f1 (Featire specs)
=======
90.68%
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 5518ff0 (Manifest_cache true)
=======
=======
=======
>>>>>>> 4e7b845 (Manifest_cache true)
=======
>>>>>>> b8aab1a (Manifest_cache true)
=======
99.2%
=======
90.68%
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 75be480 (Manifest_cache true)
=======
=======
=======
99.11%
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> a1fe6da (Featire specs)
=======
=======
=======
90.68%
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 027f794 (Manifest_cache true)
=======
=======
=======
99.11%
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 28fed3c (Featire specs)
=======
=======
=======
90.68%
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e2bfd89 (Manifest_cache true)
=======
=======
>>>>>>> f182ac7 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> aeec696 (Add login registration pages)
=======
=======
=======
99.11%
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ed6aebd (Featire specs)
=======
=======
=======
90.68%
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d1bae53 (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
=======
=======
99.25%
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 57da3ff (Add login registration pages)
<<<<<<< HEAD
>>>>>>> b5affcb (Add login registration pages)
=======
=======
=======
99.11%
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> 64d4167 (Featire specs)
=======
=======
=======
90.68%
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 35d9b13 (Manifest_cache true)
=======
=======
=======
99.2%
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
=======
=======
99.25%
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> a624084 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 4f7c979 (Add login registration pages)
=======
=======
=======
99.11%
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 13fd74f (Featire specs)
=======
=======
=======
90.68%
>>>>>>> 998f08d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7f7abc (Manifest_cache true)
=======
=======
=======
99.2%
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
=======
=======
99.25%
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 6a9fede (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 60943cc (Add login registration pages)
=======
=======
95.74%
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
>>>>>>> 1a9aba9 (Fix)
=======
=======
95.44%
>>>>>>> 446d79a (Fix)
<<<<<<< HEAD
>>>>>>> 4f1a459 (Fix)
=======
=======
=======
>>>>>>> 866aee4 (Manifest_cache true)
95.44%
=======
99.11%
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9dc109d (Featire specs)
<<<<<<< HEAD
>>>>>>> dacfb20 (Featire specs)
=======
=======
=======
90.68%
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 866aee4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 459d812 (Manifest_cache true)
=======
=======
>>>>>>> 4e7b845 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 3fef583 (Manifest_cache true)
=======
=======
=======
99.11%
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
>>>>>>> 93db8b1 (Featire specs)
=======
=======
=======
90.68%
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> b5f64c6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b746b60 (Manifest_cache true)
=======
=======
=======
99.11%
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5f76842 (Featire specs)
=======
=======
=======
90.68%
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 8c7bad7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e965665 (Manifest_cache true)
=======
=======
>>>>>>> 0005d4a (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 01d9256 (Add login registration pages)
=======
=======
=======
99.11%
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
>>>>>>> ea0650c (Featire specs)
=======
=======
=======
90.68%
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 1bfc7a6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 10b6c72 (Manifest_cache true)
=======
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
=======
=======
=======
99.25%
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 58d403b (Add login registration pages)
<<<<<<< HEAD
>>>>>>> b26425c (Add login registration pages)
=======
=======
=======
99.11%
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
>>>>>>> a038b16 (Featire specs)
=======
=======
=======
90.68%
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 3b839af (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a77cc8a (Manifest_cache true)
=======
=======
=======
99.2%
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
=======
=======
=======
99.25%
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> b575a28 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 845289f (Add login registration pages)
=======
=======
=======
99.11%
>>>>>>> 4552227 (Featire specs)
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
>>>>>>> d7fadcd (Featire specs)
=======
=======
=======
90.68%
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> 0832698 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 39467b5 (Manifest_cache true)
=======
=======
=======
99.2%
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
=======
=======
=======
99.25%
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 5caffae (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 569a007 (Add login registration pages)
=======
=======
93.06%
>>>>>>> 8f1bc14 (Fix)
<<<<<<< HEAD
>>>>>>> 49e3b70 (Fix)
=======
=======
=======
>>>>>>> e991554 (Manifest_cache true)
93.06%
=======
99.11%
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 65f3409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 78d0719 (Featire specs)
=======
=======
=======
90.68%
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> e991554 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 6edce20 (Manifest_cache true)
=======
=======
>>>>>>> b8aab1a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 04108c4 (Manifest_cache true)
=======
=======
=======
99.11%
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> c1749d5 (Featire specs)
<<<<<<< HEAD
>>>>>>> f861b82 (Featire specs)
=======
=======
=======
90.68%
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> 3c386ca (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d8298a1 (Manifest_cache true)
=======
=======
=======
99.11%
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 1cb2e82 (Featire specs)
<<<<<<< HEAD
>>>>>>> 2fd2048 (Featire specs)
=======
=======
=======
90.68%
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> fe7e312 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> bdea3aa (Manifest_cache true)
=======
=======
>>>>>>> fb10fe4 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 591c3b2 (Add login registration pages)
=======
=======
=======
99.11%
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 8577deb (Featire specs)
<<<<<<< HEAD
>>>>>>> bc0ff2c (Featire specs)
=======
=======
=======
90.68%
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 94d9078 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 07682bd (Manifest_cache true)
=======
=======
>>>>>>> 7b112c2 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 45f6de0 (Fix book_spec decrease quantity and price)
=======
=======
=======
99.25%
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 69eb97e (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 055b00f (Add login registration pages)
=======
=======
=======
99.11%
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> ebe5361 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9bf2aae (Featire specs)
=======
=======
=======
90.68%
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 2956182 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e2d040a (Manifest_cache true)
=======
=======
=======
99.2%
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> a455e8a (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 7718476 (Fix book_spec decrease quantity and price)
=======
=======
=======
99.25%
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 089f8cf (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e7ec208 (Add login registration pages)
=======
=======
=======
99.11%
>>>>>>> 4552227 (Featire specs)
>>>>>>> d3d58e0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5ce1a6d (Featire specs)
=======
=======
=======
90.68%
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> 9d9ff14 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 307ac6e (Manifest_cache true)
=======
=======
=======
99.2%
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 59078f6 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> cea736b (Fix book_spec decrease quantity and price)
=======
=======
=======
99.25%
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 0edd9b7 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 61908af (Add login registration pages)
=======
=======
92.45%
>>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
<<<<<<< HEAD
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
=======
=======
<<<<<<< HEAD
89.69%
>>>>>>> 708d0c9 (Checkout Add CreditCard Address Delivery method)
<<<<<<< HEAD
>>>>>>> 081d138 (Checkout Add CreditCard Address Delivery method)
=======
=======
88.25%
>>>>>>> 25f3c50 (Add sort orders)
>>>>>>> aa4fb26 (Add sort orders)
covered at
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 078304c (Rebased)
=======
>>>>>>> d15fe1d (Fix)
=======
>>>>>>> bebaea7 (Rebased)
=======
>>>>>>> eaef86a (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> be2f578 (Manifest_cache true)
=======
>>>>>>> 2471c87 (Add login registration pages)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> ed97c39 (Manifest_cache true)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 65459e8 (Add login registration pages)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 587ce47 (Manifest_cache true)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
>>>>>>> cb955a0 (Add login registration pages)
=======
>>>>>>> 5518ff0 (Manifest_cache true)
=======
>>>>>>> 75be480 (Manifest_cache true)
=======
>>>>>>> a1fe6da (Featire specs)
=======
>>>>>>> 027f794 (Manifest_cache true)
=======
>>>>>>> 28fed3c (Featire specs)
=======
=======
>>>>>>> aeec696 (Add login registration pages)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> d1bae53 (Manifest_cache true)
=======
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
>>>>>>> b5affcb (Add login registration pages)
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> 35d9b13 (Manifest_cache true)
=======
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4f7c979 (Add login registration pages)
=======
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> f7f7abc (Manifest_cache true)
=======
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
>>>>>>> 60943cc (Add login registration pages)
=======
>>>>>>> 1a9aba9 (Fix)
=======
>>>>>>> 4f1a459 (Fix)
=======
>>>>>>> dacfb20 (Featire specs)
=======
>>>>>>> 459d812 (Manifest_cache true)
=======
>>>>>>> 3fef583 (Manifest_cache true)
=======
>>>>>>> 93db8b1 (Featire specs)
=======
>>>>>>> b746b60 (Manifest_cache true)
=======
=======
>>>>>>> e965665 (Manifest_cache true)
=======
>>>>>>> 01d9256 (Add login registration pages)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> 10b6c72 (Manifest_cache true)
=======
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
=======
>>>>>>> b26425c (Add login registration pages)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> a77cc8a (Manifest_cache true)
=======
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 845289f (Add login registration pages)
=======
>>>>>>> d7fadcd (Featire specs)
=======
>>>>>>> 39467b5 (Manifest_cache true)
=======
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 569a007 (Add login registration pages)
=======
>>>>>>> 49e3b70 (Fix)
=======
>>>>>>> 78d0719 (Featire specs)
=======
>>>>>>> 6edce20 (Manifest_cache true)
=======
>>>>>>> 04108c4 (Manifest_cache true)
=======
>>>>>>> f861b82 (Featire specs)
=======
>>>>>>> d8298a1 (Manifest_cache true)
=======
=======
>>>>>>> bdea3aa (Manifest_cache true)
=======
>>>>>>> 591c3b2 (Add login registration pages)
=======
>>>>>>> bc0ff2c (Featire specs)
=======
>>>>>>> 07682bd (Manifest_cache true)
=======
>>>>>>> 45f6de0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 055b00f (Add login registration pages)
=======
>>>>>>> 9bf2aae (Featire specs)
=======
>>>>>>> e2d040a (Manifest_cache true)
=======
>>>>>>> 7718476 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e7ec208 (Add login registration pages)
=======
>>>>>>> 5ce1a6d (Featire specs)
=======
>>>>>>> 307ac6e (Manifest_cache true)
=======
>>>>>>> cea736b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 61908af (Add login registration pages)
=======
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
=======
>>>>>>> 081d138 (Checkout Add CreditCard Address Delivery method)
=======
=======
>>>>>>> fe7e312 (Manifest_cache true)
=======
>>>>>>> fb10fe4 (Add login registration pages)
=======
>>>>>>> 8577deb (Featire specs)
=======
>>>>>>> 94d9078 (Manifest_cache true)
=======
>>>>>>> 7b112c2 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 69eb97e (Add login registration pages)
=======
>>>>>>> ebe5361 (Featire specs)
=======
>>>>>>> 2956182 (Manifest_cache true)
=======
>>>>>>> a455e8a (Fix book_spec decrease quantity and price)
=======
>>>>>>> 089f8cf (Add login registration pages)
=======
>>>>>>> d3d58e0 (Featire specs)
=======
>>>>>>> 9d9ff14 (Manifest_cache true)
=======
>>>>>>> 59078f6 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0edd9b7 (Add login registration pages)
3.25
>>>>>>> 1cb2e82 (Featire specs)
>>>>>>> 2fd2048 (Featire specs)
=======
=======
>>>>>>> 8c7bad7 (Manifest_cache true)
=======
>>>>>>> 0005d4a (Add login registration pages)
=======
>>>>>>> e54ceb0 (Featire specs)
=======
>>>>>>> 1bfc7a6 (Manifest_cache true)
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 58d403b (Add login registration pages)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
>>>>>>> 3b839af (Manifest_cache true)
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
=======
>>>>>>> b575a28 (Add login registration pages)
=======
>>>>>>> 5a0bcc7 (Featire specs)
=======
>>>>>>> 0832698 (Manifest_cache true)
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5caffae (Add login registration pages)
3.34
>>>>>>> a2de409 (Featire specs)
>>>>>>> 5f76842 (Featire specs)
=======
=======
>>>>>>> f182ac7 (Add login registration pages)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a624084 (Add login registration pages)
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> b15044a (Manifest_cache true)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6a9fede (Add login registration pages)
3.03
>>>>>>> 2722d07 (Manifest_cache true)
>>>>>>> e2bfd89 (Manifest_cache true)
=======
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
>>>>>>> 9ec6862 (Add login registration pages)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
>>>>>>> cacbab9 (Add login registration pages)
2.92
>>>>>>> b832d45 (Featire specs)
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> b763f5b (Manifest_cache true)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 0c9131d (Manifest_cache true)
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 7945032 (Manifest_cache true)
=======
>>>>>>> 0bdcc5e (Manifest_cache true)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> b00b319 (Manifest_cache true)
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
>>>>>>> cb74525 (Add login registration pages)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> b459807 (Manifest_cache true)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8be9029 (Add login registration pages)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7d58507 (Add login registration pages)
=======
>>>>>>> e9f3851 (Manifest_cache true)
=======
>>>>>>> 307f31f (Manifest_cache true)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> d782a28 (Manifest_cache true)
=======
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> 852864e (Add login registration pages)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> add330c (Manifest_cache true)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> 551f3c1 (Add login registration pages)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 15bff2e (Manifest_cache true)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> ccec311 (Add login registration pages)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> 6c71f00 (Manifest_cache true)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8c3e531 (Add login registration pages)
=======
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> 851b4c0 (Fix)
=======
>>>>>>> 0b5b269 (Fix)
=======
>>>>>>> 8ad6192 (Fix)
=======
>>>>>>> d6f7da8 (Featire specs)
=======
>>>>>>> ab67c96 (Manifest_cache true)
=======
>>>>>>> 4e0a8d9 (Manifest_cache true)
=======
>>>>>>> f5da5ac (Featire specs)
=======
>>>>>>> 036bb32 (Manifest_cache true)
=======
=======
>>>>>>> 3e8974a (Manifest_cache true)
=======
>>>>>>> 282f108 (Add login registration pages)
=======
>>>>>>> 56a05fb (Featire specs)
=======
>>>>>>> 23e9df9 (Manifest_cache true)
=======
>>>>>>> da83d1a (Fix book_spec decrease quantity and price)
=======
>>>>>>> db0e854 (Add login registration pages)
=======
>>>>>>> 6d21330 (Featire specs)
=======
>>>>>>> 9617beb (Manifest_cache true)
=======
>>>>>>> a2a431e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2cdd6f4 (Add login registration pages)
=======
>>>>>>> 27e3351 (Featire specs)
=======
>>>>>>> b40a04e (Manifest_cache true)
=======
>>>>>>> e733663 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3a43955 (Add login registration pages)
=======
>>>>>>> 1ac6be1 (Fix)
=======
=======
>>>>>>> 8c7bad7 (Manifest_cache true)
=======
>>>>>>> 0005d4a (Add login registration pages)
=======
>>>>>>> e54ceb0 (Featire specs)
=======
>>>>>>> 1bfc7a6 (Manifest_cache true)
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 58d403b (Add login registration pages)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
>>>>>>> 3b839af (Manifest_cache true)
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
=======
>>>>>>> b575a28 (Add login registration pages)
=======
>>>>>>> 5a0bcc7 (Featire specs)
=======
>>>>>>> 0832698 (Manifest_cache true)
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5caffae (Add login registration pages)
3.34
>>>>>>> a2de409 (Featire specs)
>>>>>>> 5f79779 (Featire specs)
=======
=======
>>>>>>> f182ac7 (Add login registration pages)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a624084 (Add login registration pages)
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> b15044a (Manifest_cache true)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6a9fede (Add login registration pages)
3.03
>>>>>>> 2722d07 (Manifest_cache true)
>>>>>>> 35d17b9 (Manifest_cache true)
=======
>>>>>>> dcf74e1 (Manifest_cache true)
=======
>>>>>>> d66884b (Manifest_cache true)
=======
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> 022e63e (Manifest_cache true)
=======
>>>>>>> c006a44 (Featire specs)
=======
=======
>>>>>>> 0fc3bf0 (Add login registration pages)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> d70f030 (Manifest_cache true)
=======
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
>>>>>>> af9487a (Add login registration pages)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> cae047f (Manifest_cache true)
=======
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 140c987 (Add login registration pages)
=======
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> a9e654b (Manifest_cache true)
=======
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0c3a150 (Add login registration pages)
=======
=======
>>>>>>> f182ac7 (Add login registration pages)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a624084 (Add login registration pages)
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> b15044a (Manifest_cache true)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6a9fede (Add login registration pages)
3.03
>>>>>>> 2722d07 (Manifest_cache true)
>>>>>>> 10bdfea (Manifest_cache true)
=======
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
>>>>>>> 9ec6862 (Add login registration pages)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
>>>>>>> cacbab9 (Add login registration pages)
2.92
>>>>>>> b832d45 (Featire specs)
>>>>>>> a9bf83f (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d780a52 (Rebased)
=======
>>>>>>> 83979de (Featire specs)
=======
>>>>>>> d0f5c14 (Manifest_cache true)
=======
>>>>>>> cfd1f7f (Manifest_cache true)
=======
>>>>>>> b3f2049 (Featire specs)
=======
>>>>>>> e031bce (Manifest_cache true)
=======
=======
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 02ba384 (Manifest_cache true)
=======
=======
>>>>>>> 9ec6862 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 264ef06 (Add login registration pages)
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3e35e (Featire specs)
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 926dfe5 (Manifest_cache true)
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c54769d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 57a2e05 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> a1a8477 (Add login registration pages)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 1677b1a (Featire specs)
=======
=======
>>>>>>> 00f8b58 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1830ff1 (Manifest_cache true)
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c346782 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> cacbab9 (Add login registration pages)
>>>>>>> 551615f (Add login registration pages)
2.92
>>>>>>> b832d45 (Featire specs)
>>>>>>> 12bcf81 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> d96cf3b (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> d96cf3b (Featire specs)
=======
=======
>>>>>>> b6a32ab (Add login registration pages)
=======
>>>>>>> e50f73e (Add login registration pages)
>>>>>>> 5c33a07 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f764a87 (Fix book_spec decrease quantity and price)
=======
=======
<<<<<<< HEAD
>>>>>>> 22ee41c (Add login registration pages)
>>>>>>> b6a32ab (Add login registration pages)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
=======
<<<<<<< HEAD
>>>>>>> 22ee41c (Add login registration pages)
>>>>>>> e50f73e (Add login registration pages)
=======
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 9bebee5 (Manifest_cache true)
=======
>>>>>>> ee5935f (Manifest_cache true)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 394c6f3 (Manifest_cache true)
=======
=======
>>>>>>> 0b43b18 (Manifest_cache true)
=======
>>>>>>> 039806b (Add login registration pages)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> caaaa41 (Manifest_cache true)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 45f9f35 (Add login registration pages)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> 8874887 (Manifest_cache true)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 697ad44 (Add login registration pages)
=======
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
>>>>>>> 9ec6862 (Add login registration pages)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
>>>>>>> cacbab9 (Add login registration pages)
2.92
>>>>>>> b832d45 (Featire specs)
>>>>>>> 5be567f (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 3dc272d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 715fac2 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
=======
<<<<<<< HEAD
>>>>>>> 22ee41c (Add login registration pages)
>>>>>>> 03c0867 (Add login registration pages)
=======
>>>>>>> 3dc272d (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
=======
=======
<<<<<<< HEAD
>>>>>>> 22ee41c (Add login registration pages)
>>>>>>> 27ceb6f (Add login registration pages)
1.04
=======
<<<<<<< HEAD
4.05
=======
1.04
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d96cf3b (Featire specs)
=======
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> 3dc272d (Featire specs)
=======
3.92
>>>>>>> 752f0c0 (Featire specs)
=======
1.04
>>>>>>> bd8bda4 (Manifest_cache true)
=======
3.92
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
>>>>>>> 35d17b9 (Manifest_cache true)
=======
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 0b43b18 (Manifest_cache true)
=======
>>>>>>> 10bdfea (Manifest_cache true)
=======
>>>>>>> 5f79779 (Featire specs)
=======
>>>>>>> 3e8974a (Manifest_cache true)
=======
>>>>>>> 3dc272d (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> be2f578 (Manifest_cache true)
=======
>>>>>>> e2bfd89 (Manifest_cache true)
=======
>>>>>>> 5f76842 (Featire specs)
=======
>>>>>>> e965665 (Manifest_cache true)
=======
>>>>>>> 2fd2048 (Featire specs)
=======
>>>>>>> bdea3aa (Manifest_cache true)
=======
1.04
>>>>>>> aa7b40c (Manifest_cache true)
=======
3.9
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> cb74525 (Add login registration pages)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 852864e (Add login registration pages)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 039806b (Add login registration pages)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 0fc3bf0 (Add login registration pages)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> 282f108 (Add login registration pages)
=======
>>>>>>> 56a05fb (Featire specs)
=======
>>>>>>> 2471c87 (Add login registration pages)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> aeec696 (Add login registration pages)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> 01d9256 (Add login registration pages)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> 591c3b2 (Add login registration pages)
=======
>>>>>>> bc0ff2c (Featire specs)
=======
3.92
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
1.04
>>>>>>> 183b6c5 (Manifest_cache true)
=======
4.05
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
2.92
>>>>>>> aca90e3 (Rebased)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> d96cf3b (Featire specs)
=======
=======
>>>>>>> 926dfe5 (Manifest_cache true)
=======
>>>>>>> b459807 (Manifest_cache true)
=======
>>>>>>> add330c (Manifest_cache true)
=======
>>>>>>> caaaa41 (Manifest_cache true)
=======
>>>>>>> d70f030 (Manifest_cache true)
=======
>>>>>>> 23e9df9 (Manifest_cache true)
=======
>>>>>>> ed97c39 (Manifest_cache true)
=======
>>>>>>> d1bae53 (Manifest_cache true)
=======
>>>>>>> 10b6c72 (Manifest_cache true)
=======
>>>>>>> 07682bd (Manifest_cache true)
>>>>>>> 5c33a07 (Featire specs)
=======
=======
1.04
>>>>>>> 183b6c5 (Manifest_cache true)
=======
4.05
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8be9029 (Add login registration pages)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> 551f3c1 (Add login registration pages)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 45f9f35 (Add login registration pages)
=======
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
>>>>>>> af9487a (Add login registration pages)
=======
>>>>>>> da83d1a (Fix book_spec decrease quantity and price)
=======
>>>>>>> db0e854 (Add login registration pages)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 65459e8 (Add login registration pages)
=======
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
>>>>>>> b5affcb (Add login registration pages)
=======
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
=======
>>>>>>> b26425c (Add login registration pages)
=======
>>>>>>> 45f6de0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 055b00f (Add login registration pages)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> f764a87 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> e50f73e (Add login registration pages)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 03c0867 (Add login registration pages)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 27ceb6f (Add login registration pages)
=======
=======
3.9
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> 6d21330 (Featire specs)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> 9bf2aae (Featire specs)
>>>>>>> 22ee41c (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b6a32ab (Add login registration pages)
=======
=======
2.92
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d780a52 (Rebased)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
>>>>>>> 6fa625b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> c8cdb08 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
>>>>>>> 7945032 (Manifest_cache true)
=======
>>>>>>> 0bdcc5e (Manifest_cache true)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> b00b319 (Manifest_cache true)
=======
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
>>>>>>> 9bebee5 (Manifest_cache true)
=======
>>>>>>> ee5935f (Manifest_cache true)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 394c6f3 (Manifest_cache true)
2.92
=======
=======
>>>>>>> b5f64c6 (Manifest_cache true)
3.34
>>>>>>> 864f339 (Featire specs)
=======
3.92
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 83979de (Featire specs)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 7945032 (Manifest_cache true)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 9bebee5 (Manifest_cache true)
=======
=======
1.04
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b9cc4e9 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d0f5c14 (Manifest_cache true)
=======
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
>>>>>>> 0bdcc5e (Manifest_cache true)
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
>>>>>>> ee5935f (Manifest_cache true)
=======
=======
4.05
=======
1.04
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f5da5ac (Featire specs)
>>>>>>> 6fa625b (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> cfd1f7f (Manifest_cache true)
=======
=======
>>>>>>> 6fa625b (Manifest_cache true)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 6fa625b (Manifest_cache true)
>>>>>>> 3e9f99d (Featire specs)
=======
=======
3.92
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 036bb32 (Manifest_cache true)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> b00b319 (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 394c6f3 (Manifest_cache true)
=======
=======
1.04
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> c8cdb08 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e031bce (Manifest_cache true)
=======
=======
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 12bcf81 (Featire specs)
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
>>>>>>> 0b43b18 (Manifest_cache true)
=======
=======
1.04
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 02ba384 (Manifest_cache true)
=======
=======
>>>>>>> 9ec6862 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 264ef06 (Add login registration pages)
=======
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
=======
3.92
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fd3e35e (Featire specs)
=======
=======
>>>>>>> b459807 (Manifest_cache true)
=======
>>>>>>> caaaa41 (Manifest_cache true)
=======
=======
1.04
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 24b58e6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 926dfe5 (Manifest_cache true)
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c54769d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 8be9029 (Add login registration pages)
=======
>>>>>>> 45f9f35 (Add login registration pages)
=======
=======
3.9
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 57a2e05 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a1a8477 (Add login registration pages)
=======
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
=======
3.92
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 15bff2e (Manifest_cache true)
=======
>>>>>>> cae047f (Manifest_cache true)
=======
>>>>>>> 9617beb (Manifest_cache true)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 1677b1a (Featire specs)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 8874887 (Manifest_cache true)
=======
=======
1.04
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a2a431e (Fix book_spec decrease quantity and price)
>>>>>>> 00f8b58 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1830ff1 (Manifest_cache true)
=======
=======
>>>>>>> 00f8b58 (Manifest_cache true)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 00f8b58 (Manifest_cache true)
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
=======
4.05
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ccec311 (Add login registration pages)
=======
>>>>>>> 140c987 (Add login registration pages)
=======
>>>>>>> 2cdd6f4 (Add login registration pages)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c346782 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 7d58507 (Add login registration pages)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 697ad44 (Add login registration pages)
=======
=======
3.9
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> 27e3351 (Featire specs)
>>>>>>> cacbab9 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 551615f (Add login registration pages)
=======
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 078304c (Rebased)
=======
0.7
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d52ad35 (Rebased)
=======
=======
>>>>>>> 872e675 (Fix)
=======
<<<<<<< HEAD
3.03
<<<<<<< HEAD
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
=======
=======
3.92
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
=======
=======
=======
1.04
>>>>>>> 183b6c5 (Manifest_cache true)
=======
4.05
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> 22ee41c (Add login registration pages)
>>>>>>> e50f73e (Add login registration pages)
=======
=======
2.92
>>>>>>> c033601 (Rebased)
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
>>>>>>> 7945032 (Manifest_cache true)
=======
>>>>>>> 6fa625b (Manifest_cache true)
>>>>>>> 0bdcc5e (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> b00b319 (Manifest_cache true)
=======
=======
>>>>>>> b832d45 (Featire specs)
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
=======
>>>>>>> 9ec6862 (Add login registration pages)
>>>>>>> cb74525 (Add login registration pages)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> b459807 (Manifest_cache true)
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8be9029 (Add login registration pages)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 00f8b58 (Manifest_cache true)
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7d58507 (Add login registration pages)
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 872e675 (Fix)
=======
=======
=======
3.92
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
=======
=======
>>>>>>> dcf74e1 (Manifest_cache true)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> d66884b (Manifest_cache true)
=======
>>>>>>> bcd09ab (Featire specs)
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
>>>>>>> 022e63e (Manifest_cache true)
=======
>>>>>>> c006a44 (Featire specs)
3.03
=======
3.34
>>>>>>> 4e7b845 (Manifest_cache true)
=======
3.92
>>>>>>> d0dc1f1 (Featire specs)
=======
1.04
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4e0a8d9 (Manifest_cache true)
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> d66884b (Manifest_cache true)
=======
=======
>>>>>>> 4e7b845 (Manifest_cache true)
=======
4.05
=======
1.04
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4e0a8d9 (Manifest_cache true)
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> bcd09ab (Featire specs)
=======
=======
3.92
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
>>>>>>> 022e63e (Manifest_cache true)
=======
=======
1.04
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
>>>>>>> c006a44 (Featire specs)
=======
=======
3.92
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> 10bdfea (Manifest_cache true)
=======
=======
1.04
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 35d17b9 (Manifest_cache true)
=======
=======
>>>>>>> f182ac7 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 852864e (Add login registration pages)
=======
=======
>>>>>>> 848bfa2 (Featire specs)
=======
=======
3.92
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> d70f030 (Manifest_cache true)
=======
=======
1.04
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> add330c (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> af9487a (Add login registration pages)
=======
=======
3.9
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 57da3ff (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 551f3c1 (Add login registration pages)
=======
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
=======
3.92
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> cae047f (Manifest_cache true)
=======
=======
1.04
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 15bff2e (Manifest_cache true)
=======
=======
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
=======
4.05
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 140c987 (Add login registration pages)
=======
=======
3.9
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> a624084 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ccec311 (Add login registration pages)
=======
=======
>>>>>>> fefbd35 (Featire specs)
=======
=======
3.92
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b40a04e (Manifest_cache true)
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> a9e654b (Manifest_cache true)
=======
=======
1.04
>>>>>>> 998f08d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e733663 (Fix book_spec decrease quantity and price)
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 6c71f00 (Manifest_cache true)
=======
=======
>>>>>>> b15044a (Manifest_cache true)
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
=======
4.05
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 3a43955 (Add login registration pages)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> 0c3a150 (Add login registration pages)
=======
=======
3.9
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 6a9fede (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8c3e531 (Add login registration pages)
=======
=======
3.36
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1d59aaa (Fix)
=======
=======
3.34
>>>>>>> 446d79a (Fix)
<<<<<<< HEAD
>>>>>>> 851b4c0 (Fix)
=======
=======
3.92
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> 715fac2 (Featire specs)
=======
=======
=======
1.04
>>>>>>> 183b6c5 (Manifest_cache true)
=======
4.05
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 22ee41c (Add login registration pages)
>>>>>>> 03c0867 (Add login registration pages)
=======
=======
2.92
>>>>>>> c033601 (Rebased)
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
>>>>>>> 9bebee5 (Manifest_cache true)
=======
>>>>>>> 6fa625b (Manifest_cache true)
>>>>>>> ee5935f (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 394c6f3 (Manifest_cache true)
=======
=======
>>>>>>> b832d45 (Featire specs)
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 0b43b18 (Manifest_cache true)
=======
=======
>>>>>>> 9ec6862 (Add login registration pages)
>>>>>>> 039806b (Add login registration pages)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> caaaa41 (Manifest_cache true)
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 45f9f35 (Add login registration pages)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> 00f8b58 (Manifest_cache true)
>>>>>>> 8874887 (Manifest_cache true)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> cacbab9 (Add login registration pages)
>>>>>>> 697ad44 (Add login registration pages)
=======
>>>>>>> 078304c (Rebased)
=======
=======
<<<<<<< HEAD
3.03
<<<<<<< HEAD
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> d15fe1d (Fix)
=======
=======
=======
3.92
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
>>>>>>> b4763a2 (Featire specs)
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> dcf74e1 (Manifest_cache true)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> d66884b (Manifest_cache true)
=======
>>>>>>> 59d75f9 (Featire specs)
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> 96aecde (Manifest_cache true)
>>>>>>> 022e63e (Manifest_cache true)
=======
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 10bdfea (Manifest_cache true)
=======
=======
>>>>>>> f182ac7 (Add login registration pages)
>>>>>>> 0fc3bf0 (Add login registration pages)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> d70f030 (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
>>>>>>> af9487a (Add login registration pages)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> cae047f (Manifest_cache true)
=======
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 140c987 (Add login registration pages)
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> b15044a (Manifest_cache true)
>>>>>>> a9e654b (Manifest_cache true)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0c3a150 (Add login registration pages)
=======
=======
3.36
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 0b5b269 (Fix)
=======
=======
3.34
>>>>>>> 446d79a (Fix)
>>>>>>> 8ad6192 (Fix)
=======
=======
=======
>>>>>>> 866aee4 (Manifest_cache true)
3.34
=======
3.92
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9dc109d (Featire specs)
<<<<<<< HEAD
>>>>>>> d6f7da8 (Featire specs)
=======
=======
=======
1.04
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 866aee4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> ab67c96 (Manifest_cache true)
=======
=======
>>>>>>> 4e7b845 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4e0a8d9 (Manifest_cache true)
=======
=======
=======
3.92
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
>>>>>>> f5da5ac (Featire specs)
=======
=======
=======
1.04
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> b5f64c6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 036bb32 (Manifest_cache true)
=======
=======
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5f79779 (Featire specs)
=======
=======
=======
1.04
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 8c7bad7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 3e8974a (Manifest_cache true)
=======
=======
>>>>>>> 0005d4a (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 282f108 (Add login registration pages)
=======
=======
=======
3.92
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 56a05fb (Featire specs)
=======
=======
=======
1.04
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 1bfc7a6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 23e9df9 (Manifest_cache true)
=======
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> da83d1a (Fix book_spec decrease quantity and price)
=======
=======
=======
3.9
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 58d403b (Add login registration pages)
<<<<<<< HEAD
>>>>>>> db0e854 (Add login registration pages)
=======
=======
=======
3.92
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6d21330 (Featire specs)
=======
=======
=======
1.04
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 3b839af (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 9617beb (Manifest_cache true)
=======
=======
=======
4.05
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2a431e (Fix book_spec decrease quantity and price)
=======
=======
=======
3.9
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> b575a28 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 2cdd6f4 (Add login registration pages)
=======
=======
=======
3.92
>>>>>>> 4552227 (Featire specs)
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 27e3351 (Featire specs)
=======
=======
=======
1.04
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> 0832698 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b40a04e (Manifest_cache true)
=======
=======
=======
4.05
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> e733663 (Fix book_spec decrease quantity and price)
=======
=======
=======
3.9
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 5caffae (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 3a43955 (Add login registration pages)
=======
=======
3.25
>>>>>>> 8f1bc14 (Fix)
>>>>>>> 1ac6be1 (Fix)
=======
1.04
>>>>>>> cde4834 (Manifest_cache true)
=======
=======
3.92
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> 3dc272d (Featire specs)
=======
=======
=======
1.04
>>>>>>> 183b6c5 (Manifest_cache true)
=======
4.05
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 22ee41c (Add login registration pages)
>>>>>>> 27ceb6f (Add login registration pages)
=======
=======
2.92
>>>>>>> c033601 (Rebased)
>>>>>>> 1577aeb (Rebased)
=======
=======
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
>>>>>>> 6fa625b (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> c8cdb08 (Manifest_cache true)
2.92
=======
=======
>>>>>>> b5f64c6 (Manifest_cache true)
3.34
>>>>>>> 864f339 (Featire specs)
=======
=======
>>>>>>> 3c386ca (Manifest_cache true)
3.25
>>>>>>> c1749d5 (Featire specs)
=======
3.92
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 8c32a77 (Featire specs)
=======
=======
=======
1.04
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b9cc4e9 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 902b803 (Manifest_cache true)
=======
=======
=======
4.05
=======
1.04
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6fa625b (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0c9131d (Manifest_cache true)
=======
=======
=======
3.92
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 56ef3ac (Featire specs)
=======
=======
=======
1.04
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> c8cdb08 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b763f5b (Manifest_cache true)
=======
=======
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 113da87 (Featire specs)
=======
=======
=======
1.04
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> be2f578 (Manifest_cache true)
=======
=======
>>>>>>> 9ec6862 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 2471c87 (Add login registration pages)
=======
=======
=======
3.92
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 8b420cf (Featire specs)
=======
=======
=======
1.04
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 24b58e6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> ed97c39 (Manifest_cache true)
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
=======
3.9
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 57a2e05 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 65459e8 (Add login registration pages)
=======
=======
=======
3.92
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 20256f8 (Featire specs)
=======
=======
=======
1.04
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 00f8b58 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 587ce47 (Manifest_cache true)
=======
=======
=======
4.05
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
=======
=======
3.9
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> cacbab9 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> cb955a0 (Add login registration pages)
=======
=======
0.7
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
>>>>>>> bebaea7 (Rebased)
=======
=======
<<<<<<< HEAD
3.03
<<<<<<< HEAD
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> eaef86a (Fix)
=======
=======
=======
3.92
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> b35d1f8 (Featire specs)
=======
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> c4adab0 (Featire specs)
3.03
=======
3.34
>>>>>>> 4e7b845 (Manifest_cache true)
=======
3.25
>>>>>>> b8aab1a (Manifest_cache true)
=======
3.92
>>>>>>> d0dc1f1 (Featire specs)
=======
1.04
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 5518ff0 (Manifest_cache true)
=======
=======
=======
>>>>>>> 4e7b845 (Manifest_cache true)
=======
>>>>>>> b8aab1a (Manifest_cache true)
=======
4.05
=======
1.04
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 75be480 (Manifest_cache true)
=======
=======
=======
3.92
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> a1fe6da (Featire specs)
=======
=======
=======
1.04
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 027f794 (Manifest_cache true)
=======
=======
=======
3.92
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 28fed3c (Featire specs)
=======
=======
=======
1.04
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e2bfd89 (Manifest_cache true)
=======
=======
>>>>>>> f182ac7 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> aeec696 (Add login registration pages)
=======
=======
=======
3.92
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ed6aebd (Featire specs)
=======
=======
=======
1.04
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d1bae53 (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
=======
=======
3.9
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 57da3ff (Add login registration pages)
<<<<<<< HEAD
>>>>>>> b5affcb (Add login registration pages)
=======
=======
=======
3.92
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> 64d4167 (Featire specs)
=======
=======
=======
1.04
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 35d9b13 (Manifest_cache true)
=======
=======
=======
4.05
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
=======
=======
3.9
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> a624084 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 4f7c979 (Add login registration pages)
=======
=======
=======
3.92
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 13fd74f (Featire specs)
=======
=======
=======
1.04
>>>>>>> 998f08d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7f7abc (Manifest_cache true)
=======
=======
=======
4.05
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
=======
=======
3.9
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 6a9fede (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 60943cc (Add login registration pages)
=======
=======
3.36
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
>>>>>>> 1a9aba9 (Fix)
=======
=======
3.34
>>>>>>> 446d79a (Fix)
<<<<<<< HEAD
>>>>>>> 4f1a459 (Fix)
=======
=======
=======
>>>>>>> 866aee4 (Manifest_cache true)
3.34
=======
3.92
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9dc109d (Featire specs)
<<<<<<< HEAD
>>>>>>> dacfb20 (Featire specs)
=======
=======
=======
1.04
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 866aee4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 459d812 (Manifest_cache true)
=======
=======
>>>>>>> 4e7b845 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 3fef583 (Manifest_cache true)
=======
=======
=======
3.92
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
>>>>>>> 93db8b1 (Featire specs)
=======
=======
=======
1.04
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> b5f64c6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b746b60 (Manifest_cache true)
=======
=======
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5f76842 (Featire specs)
=======
=======
=======
1.04
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 8c7bad7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e965665 (Manifest_cache true)
=======
=======
>>>>>>> 0005d4a (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 01d9256 (Add login registration pages)
=======
=======
=======
3.92
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
>>>>>>> ea0650c (Featire specs)
=======
=======
=======
1.04
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 1bfc7a6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 10b6c72 (Manifest_cache true)
=======
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
=======
=======
=======
3.9
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 58d403b (Add login registration pages)
<<<<<<< HEAD
>>>>>>> b26425c (Add login registration pages)
=======
=======
=======
3.92
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
>>>>>>> a038b16 (Featire specs)
=======
=======
=======
1.04
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 3b839af (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a77cc8a (Manifest_cache true)
=======
=======
=======
4.05
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
=======
=======
=======
3.9
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> b575a28 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 845289f (Add login registration pages)
=======
=======
=======
3.92
>>>>>>> 4552227 (Featire specs)
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
>>>>>>> d7fadcd (Featire specs)
=======
=======
=======
1.04
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> 0832698 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 39467b5 (Manifest_cache true)
=======
=======
=======
4.05
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
=======
=======
=======
3.9
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 5caffae (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 569a007 (Add login registration pages)
=======
=======
3.25
>>>>>>> 8f1bc14 (Fix)
<<<<<<< HEAD
>>>>>>> 49e3b70 (Fix)
=======
=======
=======
>>>>>>> e991554 (Manifest_cache true)
3.25
=======
3.92
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 65f3409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 78d0719 (Featire specs)
=======
=======
=======
1.04
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> e991554 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 6edce20 (Manifest_cache true)
=======
=======
>>>>>>> b8aab1a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 04108c4 (Manifest_cache true)
=======
=======
=======
3.92
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> c1749d5 (Featire specs)
<<<<<<< HEAD
>>>>>>> f861b82 (Featire specs)
=======
=======
=======
1.04
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> 3c386ca (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d8298a1 (Manifest_cache true)
=======
=======
>>>>>>> 1cb2e82 (Featire specs)
<<<<<<< HEAD
>>>>>>> 2fd2048 (Featire specs)
=======
=======
=======
1.04
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> fe7e312 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> bdea3aa (Manifest_cache true)
=======
=======
>>>>>>> fb10fe4 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 591c3b2 (Add login registration pages)
=======
=======
=======
3.92
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 8577deb (Featire specs)
<<<<<<< HEAD
>>>>>>> bc0ff2c (Featire specs)
=======
=======
=======
1.04
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 94d9078 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 07682bd (Manifest_cache true)
=======
=======
>>>>>>> 7b112c2 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 45f6de0 (Fix book_spec decrease quantity and price)
=======
=======
=======
3.9
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 69eb97e (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 055b00f (Add login registration pages)
=======
=======
=======
3.92
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> ebe5361 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9bf2aae (Featire specs)
=======
=======
=======
1.04
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 2956182 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e2d040a (Manifest_cache true)
=======
=======
=======
4.05
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> a455e8a (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 7718476 (Fix book_spec decrease quantity and price)
=======
=======
=======
3.9
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 089f8cf (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e7ec208 (Add login registration pages)
=======
=======
=======
3.92
>>>>>>> 4552227 (Featire specs)
>>>>>>> d3d58e0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5ce1a6d (Featire specs)
=======
=======
=======
1.04
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> 9d9ff14 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 307ac6e (Manifest_cache true)
=======
=======
=======
4.05
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 59078f6 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> cea736b (Fix book_spec decrease quantity and price)
=======
=======
=======
3.9
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 0edd9b7 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 61908af (Add login registration pages)
=======
=======
3.38
>>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
<<<<<<< HEAD
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
=======
=======
3.25
>>>>>>> 708d0c9 (Checkout Add CreditCard Address Delivery method)
>>>>>>> 081d138 (Checkout Add CreditCard Address Delivery method)
hits/line
)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> d780a52 (Rebased)
=======
>>>>>>> 83979de (Featire specs)
=======
>>>>>>> d0f5c14 (Manifest_cache true)
=======
>>>>>>> cfd1f7f (Manifest_cache true)
=======
>>>>>>> b3f2049 (Featire specs)
=======
>>>>>>> e031bce (Manifest_cache true)
=======
>>>>>>> 12bcf81 (Featire specs)
=======
>>>>>>> 02ba384 (Manifest_cache true)
=======
>>>>>>> 264ef06 (Add login registration pages)
=======
>>>>>>> fd3e35e (Featire specs)
=======
>>>>>>> 926dfe5 (Manifest_cache true)
=======
>>>>>>> c54769d (Fix book_spec decrease quantity and price)
=======
>>>>>>> a1a8477 (Add login registration pages)
=======
>>>>>>> 1677b1a (Featire specs)
=======
>>>>>>> 1830ff1 (Manifest_cache true)
=======
>>>>>>> c346782 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 551615f (Add login registration pages)
=======
>>>>>>> d52ad35 (Rebased)
=======
>>>>>>> b28889f (Fix)
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 7945032 (Manifest_cache true)
=======
>>>>>>> 0bdcc5e (Manifest_cache true)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> b00b319 (Manifest_cache true)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
>>>>>>> cb74525 (Add login registration pages)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> b459807 (Manifest_cache true)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8be9029 (Add login registration pages)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7d58507 (Add login registration pages)
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> e9f3851 (Manifest_cache true)
=======
>>>>>>> 307f31f (Manifest_cache true)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> d782a28 (Manifest_cache true)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 35d17b9 (Manifest_cache true)
=======
>>>>>>> 852864e (Add login registration pages)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> add330c (Manifest_cache true)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> 551f3c1 (Add login registration pages)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 15bff2e (Manifest_cache true)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> ccec311 (Add login registration pages)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> 6c71f00 (Manifest_cache true)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8c3e531 (Add login registration pages)
=======
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 9bebee5 (Manifest_cache true)
=======
>>>>>>> ee5935f (Manifest_cache true)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 394c6f3 (Manifest_cache true)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 0b43b18 (Manifest_cache true)
=======
>>>>>>> 039806b (Add login registration pages)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> caaaa41 (Manifest_cache true)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 45f9f35 (Add login registration pages)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> 8874887 (Manifest_cache true)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 697ad44 (Add login registration pages)
=======
>>>>>>> 078304c (Rebased)
=======
>>>>>>> d15fe1d (Fix)
=======
>>>>>>> b4763a2 (Featire specs)
=======
>>>>>>> dcf74e1 (Manifest_cache true)
=======
>>>>>>> d66884b (Manifest_cache true)
=======
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> 022e63e (Manifest_cache true)
=======
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 10bdfea (Manifest_cache true)
=======
>>>>>>> 0fc3bf0 (Add login registration pages)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> d70f030 (Manifest_cache true)
=======
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
>>>>>>> af9487a (Add login registration pages)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> cae047f (Manifest_cache true)
=======
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 140c987 (Add login registration pages)
=======
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> a9e654b (Manifest_cache true)
=======
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0c3a150 (Add login registration pages)
=======
>>>>>>> 0b5b269 (Fix)
=======
>>>>>>> d6f7da8 (Featire specs)
=======
>>>>>>> ab67c96 (Manifest_cache true)
=======
>>>>>>> 4e0a8d9 (Manifest_cache true)
=======
>>>>>>> f5da5ac (Featire specs)
=======
>>>>>>> 036bb32 (Manifest_cache true)
=======
>>>>>>> 5f79779 (Featire specs)
=======
>>>>>>> 3e8974a (Manifest_cache true)
=======
>>>>>>> 282f108 (Add login registration pages)
=======
>>>>>>> 56a05fb (Featire specs)
=======
>>>>>>> 23e9df9 (Manifest_cache true)
=======
>>>>>>> da83d1a (Fix book_spec decrease quantity and price)
=======
>>>>>>> db0e854 (Add login registration pages)
=======
>>>>>>> 6d21330 (Featire specs)
=======
>>>>>>> 9617beb (Manifest_cache true)
=======
>>>>>>> a2a431e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2cdd6f4 (Add login registration pages)
=======
>>>>>>> 27e3351 (Featire specs)
=======
>>>>>>> b40a04e (Manifest_cache true)
=======
>>>>>>> e733663 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3a43955 (Add login registration pages)
=======
>>>>>>> 1ac6be1 (Fix)
=======
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 902b803 (Manifest_cache true)
=======
>>>>>>> 0c9131d (Manifest_cache true)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> b763f5b (Manifest_cache true)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> be2f578 (Manifest_cache true)
=======
>>>>>>> 2471c87 (Add login registration pages)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> ed97c39 (Manifest_cache true)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 65459e8 (Add login registration pages)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 587ce47 (Manifest_cache true)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
>>>>>>> cb955a0 (Add login registration pages)
=======
>>>>>>> bebaea7 (Rebased)
=======
>>>>>>> eaef86a (Fix)
=======
>>>>>>> b35d1f8 (Featire specs)
=======
>>>>>>> 5518ff0 (Manifest_cache true)
=======
>>>>>>> 75be480 (Manifest_cache true)
=======
>>>>>>> a1fe6da (Featire specs)
=======
>>>>>>> 027f794 (Manifest_cache true)
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> e2bfd89 (Manifest_cache true)
=======
>>>>>>> aeec696 (Add login registration pages)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> d1bae53 (Manifest_cache true)
=======
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
>>>>>>> b5affcb (Add login registration pages)
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> 35d9b13 (Manifest_cache true)
=======
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4f7c979 (Add login registration pages)
=======
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> f7f7abc (Manifest_cache true)
=======
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
>>>>>>> 60943cc (Add login registration pages)
=======
>>>>>>> 1a9aba9 (Fix)
=======
>>>>>>> dacfb20 (Featire specs)
=======
>>>>>>> 459d812 (Manifest_cache true)
=======
>>>>>>> 3fef583 (Manifest_cache true)
=======
>>>>>>> 93db8b1 (Featire specs)
=======
>>>>>>> b746b60 (Manifest_cache true)
=======
>>>>>>> 5f76842 (Featire specs)
=======
>>>>>>> e965665 (Manifest_cache true)
=======
>>>>>>> 01d9256 (Add login registration pages)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> 10b6c72 (Manifest_cache true)
=======
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
=======
>>>>>>> b26425c (Add login registration pages)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> a77cc8a (Manifest_cache true)
=======
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 845289f (Add login registration pages)
=======
>>>>>>> d7fadcd (Featire specs)
=======
>>>>>>> 39467b5 (Manifest_cache true)
=======
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 569a007 (Add login registration pages)
=======
>>>>>>> 49e3b70 (Fix)
=======
>>>>>>> 78d0719 (Featire specs)
=======
>>>>>>> 6edce20 (Manifest_cache true)
=======
>>>>>>> 04108c4 (Manifest_cache true)
=======
>>>>>>> f861b82 (Featire specs)
=======
>>>>>>> d8298a1 (Manifest_cache true)
=======
>>>>>>> 2fd2048 (Featire specs)
=======
>>>>>>> bdea3aa (Manifest_cache true)
=======
>>>>>>> 591c3b2 (Add login registration pages)
=======
>>>>>>> bc0ff2c (Featire specs)
=======
>>>>>>> 07682bd (Manifest_cache true)
=======
>>>>>>> 45f6de0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 055b00f (Add login registration pages)
=======
>>>>>>> 9bf2aae (Featire specs)
=======
>>>>>>> e2d040a (Manifest_cache true)
=======
>>>>>>> 7718476 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e7ec208 (Add login registration pages)
=======
>>>>>>> 5ce1a6d (Featire specs)
=======
>>>>>>> 307ac6e (Manifest_cache true)
=======
>>>>>>> cea736b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 61908af (Add login registration pages)
=======
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
=======
>>>>>>> 081d138 (Checkout Add CreditCard Address Delivery method)
=======
<<<<<<< HEAD
>>>>>>> d96cf3b (Featire specs)
=======
=======
>>>>>>> df37394 (Featire specs)
=======
=======
>>>>>>> 715fac2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 3dc272d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> d96cf3b (Featire specs)
=======
=======
>>>>>>> b6a32ab (Add login registration pages)
=======
>>>>>>> e50f73e (Add login registration pages)
=======
>>>>>>> 03c0867 (Add login registration pages)
=======
>>>>>>> 27ceb6f (Add login registration pages)
>>>>>>> 5c33a07 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f764a87 (Fix book_spec decrease quantity and price)
=======
=======
<<<<<<< HEAD
>>>>>>> 22ee41c (Add login registration pages)
>>>>>>> b6a32ab (Add login registration pages)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
=======
<<<<<<< HEAD
>>>>>>> 22ee41c (Add login registration pages)
>>>>>>> e50f73e (Add login registration pages)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
=======
<<<<<<< HEAD
>>>>>>> 22ee41c (Add login registration pages)
>>>>>>> 03c0867 (Add login registration pages)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 3dc272d (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
=======
=======
<<<<<<< HEAD
>>>>>>> 22ee41c (Add login registration pages)
>>>>>>> 27ceb6f (Add login registration pages)
34 files in total.
=======
<<<<<<< HEAD
47 files in total.
>>>>>>> 7375d4b (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a636fda (Featire specs)
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
92 files in total.
<<<<<<< HEAD
>>>>>>> aca90e3 (Rebased)
=======
<<<<<<< HEAD
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> d780a52 (Rebased)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> c8cdb08 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
>>>>>>> 9ec6862 (Add login registration pages)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 24b58e6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
>>>>>>> cacbab9 (Add login registration pages)
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f182ac7 (Add login registration pages)
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a624084 (Add login registration pages)
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b15044a (Manifest_cache true)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6a9fede (Add login registration pages)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 394c6f3 (Manifest_cache true)
=======
=======
>>>>>>> b832d45 (Featire specs)
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 57a2e05 (Add login registration pages)
>>>>>>> 45f9f35 (Add login registration pages)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
=======
>>>>>>> 00f8b58 (Manifest_cache true)
>>>>>>> 8874887 (Manifest_cache true)
=======
>>>>>>> 022e63e (Manifest_cache true)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 10bdfea (Manifest_cache true)
=======
=======
>>>>>>> f182ac7 (Add login registration pages)
>>>>>>> 0fc3bf0 (Add login registration pages)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
>>>>>>> d70f030 (Manifest_cache true)
=======
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
>>>>>>> af9487a (Add login registration pages)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
>>>>>>> cae047f (Manifest_cache true)
=======
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> a624084 (Add login registration pages)
>>>>>>> 140c987 (Add login registration pages)
=======
>>>>>>> fefbd35 (Featire specs)
=======
=======
>>>>>>> b15044a (Manifest_cache true)
>>>>>>> a9e654b (Manifest_cache true)
=======
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 6a9fede (Add login registration pages)
>>>>>>> 0c3a150 (Add login registration pages)
92 files in total.
=======
=======
>>>>>>> b5f64c6 (Manifest_cache true)
=======
>>>>>>> a2de409 (Featire specs)
=======
>>>>>>> 8c7bad7 (Manifest_cache true)
=======
>>>>>>> 0005d4a (Add login registration pages)
=======
>>>>>>> e54ceb0 (Featire specs)
=======
>>>>>>> 1bfc7a6 (Manifest_cache true)
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 58d403b (Add login registration pages)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
>>>>>>> 3b839af (Manifest_cache true)
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
=======
>>>>>>> b575a28 (Add login registration pages)
=======
>>>>>>> 5a0bcc7 (Featire specs)
=======
>>>>>>> 0832698 (Manifest_cache true)
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5caffae (Add login registration pages)
112 files in total.
>>>>>>> 864f339 (Featire specs)
=======
=======
>>>>>>> 94d9078 (Manifest_cache true)
=======
>>>>>>> 7b112c2 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 69eb97e (Add login registration pages)
=======
>>>>>>> ebe5361 (Featire specs)
=======
>>>>>>> 2956182 (Manifest_cache true)
=======
>>>>>>> a455e8a (Fix book_spec decrease quantity and price)
=======
>>>>>>> 089f8cf (Add login registration pages)
=======
>>>>>>> d3d58e0 (Featire specs)
=======
>>>>>>> 9d9ff14 (Manifest_cache true)
=======
>>>>>>> 59078f6 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0edd9b7 (Add login registration pages)
114 files in total.
>>>>>>> 8577deb (Featire specs)
=======
47 files in total.
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 6fa625b (Manifest_cache true)
>>>>>>> cfd1f7f (Manifest_cache true)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 7945032 (Manifest_cache true)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 9bebee5 (Manifest_cache true)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 902b803 (Manifest_cache true)
92 files in total.
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ee78f39 (Rebased)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> c8cdb08 (Manifest_cache true)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9ec6862 (Add login registration pages)
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> cacbab9 (Add login registration pages)
=======
<<<<<<< HEAD
=======
>>>>>>> ee5935f (Manifest_cache true)
=======
>>>>>>> 0b43b18 (Manifest_cache true)
=======
=======
>>>>>>> 9ec6862 (Add login registration pages)
>>>>>>> 039806b (Add login registration pages)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
>>>>>>> caaaa41 (Manifest_cache true)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> cacbab9 (Add login registration pages)
>>>>>>> 697ad44 (Add login registration pages)
=======
>>>>>>> 59d75f9 (Featire specs)
>>>>>>> bcd09ab (Featire specs)
=======
=======
>>>>>>> 0c9131d (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> b763f5b (Manifest_cache true)
=======
=======
>>>>>>> b832d45 (Featire specs)
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> be2f578 (Manifest_cache true)
=======
=======
>>>>>>> 9ec6862 (Add login registration pages)
>>>>>>> 2471c87 (Add login registration pages)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> ed97c39 (Manifest_cache true)
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 57a2e05 (Add login registration pages)
>>>>>>> 65459e8 (Add login registration pages)
=======
>>>>>>> 20256f8 (Featire specs)
=======
=======
>>>>>>> 00f8b58 (Manifest_cache true)
>>>>>>> 587ce47 (Manifest_cache true)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> cacbab9 (Add login registration pages)
>>>>>>> cb955a0 (Add login registration pages)
=======
>>>>>>> a1fe6da (Featire specs)
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
>>>>>>> 027f794 (Manifest_cache true)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> e2bfd89 (Manifest_cache true)
=======
=======
>>>>>>> f182ac7 (Add login registration pages)
>>>>>>> aeec696 (Add login registration pages)
=======
>>>>>>> ed6aebd (Featire specs)
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
>>>>>>> d1bae53 (Manifest_cache true)
=======
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
>>>>>>> b5affcb (Add login registration pages)
=======
>>>>>>> 64d4167 (Featire specs)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
>>>>>>> 35d9b13 (Manifest_cache true)
=======
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> a624084 (Add login registration pages)
>>>>>>> 4f7c979 (Add login registration pages)
=======
>>>>>>> 13fd74f (Featire specs)
=======
=======
>>>>>>> b15044a (Manifest_cache true)
>>>>>>> f7f7abc (Manifest_cache true)
=======
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 6a9fede (Add login registration pages)
>>>>>>> 60943cc (Add login registration pages)
92 files in total.
=======
=======
>>>>>>> b5f64c6 (Manifest_cache true)
=======
>>>>>>> a2de409 (Featire specs)
=======
>>>>>>> 8c7bad7 (Manifest_cache true)
=======
>>>>>>> 0005d4a (Add login registration pages)
=======
>>>>>>> e54ceb0 (Featire specs)
=======
>>>>>>> 1bfc7a6 (Manifest_cache true)
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 58d403b (Add login registration pages)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
>>>>>>> 3b839af (Manifest_cache true)
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
=======
>>>>>>> b575a28 (Add login registration pages)
=======
>>>>>>> 5a0bcc7 (Featire specs)
=======
>>>>>>> 0832698 (Manifest_cache true)
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5caffae (Add login registration pages)
112 files in total.
>>>>>>> 864f339 (Featire specs)
=======
47 files in total.
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 6fa625b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0bdcc5e (Manifest_cache true)
=======
92 files in total.
>>>>>>> c033601 (Rebased)
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> ee5935f (Manifest_cache true)
=======
92 files in total.
>>>>>>> c033601 (Rebased)
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 0c9131d (Manifest_cache true)
1118 relevant lines,
1070 lines covered and
48 lines missed.
(
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 0bdcc5e (Manifest_cache true)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> ee5935f (Manifest_cache true)
=======
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 0c9131d (Manifest_cache true)
90.68%
=======
99.2%
=======
34 files in total.
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
47 files in total.
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
52 files in total.
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> b6a32ab (Add login registration pages)
400 relevant lines,
397 lines covered and
=======
>>>>>>> 7375d4b (Manifest_cache true)
=======
47 files in total.
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
52 files in total.
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
377 relevant lines,
374 lines covered and
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
400 relevant lines,
397 lines covered and
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> 7375d4b (Manifest_cache true)
=======
47 files in total.
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
52 files in total.
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
377 relevant lines,
374 lines covered and
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
400 relevant lines,
397 lines covered and
>>>>>>> 57da3ff (Add login registration pages)
3 lines missed.
(
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 57a2e05 (Add login registration pages)
<<<<<<< HEAD
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57da3ff (Add login registration pages)
99.11%
>>>>>>> d0dc1f1 (Featire specs)
=======
=======
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
47 files in total.
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
52 files in total.
>>>>>>> 730a8ca (Add login registration pages)
400 relevant lines,
397 lines covered and
=======
>>>>>>> 7375d4b (Manifest_cache true)
=======
47 files in total.
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
52 files in total.
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
377 relevant lines,
374 lines covered and
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
400 relevant lines,
397 lines covered and
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> 7375d4b (Manifest_cache true)
=======
47 files in total.
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
52 files in total.
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
377 relevant lines,
374 lines covered and
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
400 relevant lines,
397 lines covered and
>>>>>>> 57da3ff (Add login registration pages)
3 lines missed.
(
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e50f73e (Add login registration pages)
=======
=======
>>>>>>> 8be9029 (Add login registration pages)
<<<<<<< HEAD
=======
=======
>>>>>>> 57a2e05 (Add login registration pages)
<<<<<<< HEAD
99.11%
>>>>>>> d0dc1f1 (Featire specs)
=======
=======
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
47 files in total.
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
52 files in total.
>>>>>>> 730a8ca (Add login registration pages)
400 relevant lines,
397 lines covered and
=======
>>>>>>> 7375d4b (Manifest_cache true)
=======
47 files in total.
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
52 files in total.
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
377 relevant lines,
374 lines covered and
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
400 relevant lines,
397 lines covered and
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> 7375d4b (Manifest_cache true)
=======
47 files in total.
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
52 files in total.
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
377 relevant lines,
374 lines covered and
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
400 relevant lines,
397 lines covered and
>>>>>>> 57da3ff (Add login registration pages)
3 lines missed.
(
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 03c0867 (Add login registration pages)
=======
=======
>>>>>>> 45f9f35 (Add login registration pages)
=======
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
>>>>>>> af9487a (Add login registration pages)
<<<<<<< HEAD
=======
=======
>>>>>>> 57a2e05 (Add login registration pages)
<<<<<<< HEAD
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57da3ff (Add login registration pages)
99.11%
>>>>>>> d0dc1f1 (Featire specs)
=======
=======
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
47 files in total.
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
52 files in total.
>>>>>>> 730a8ca (Add login registration pages)
400 relevant lines,
397 lines covered and
=======
>>>>>>> 7375d4b (Manifest_cache true)
=======
47 files in total.
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
52 files in total.
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
377 relevant lines,
374 lines covered and
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
400 relevant lines,
397 lines covered and
>>>>>>> 57a2e05 (Add login registration pages)
3 lines missed.
(
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 27ceb6f (Add login registration pages)
=======
=======
>>>>>>> 65459e8 (Add login registration pages)
=======
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
>>>>>>> b5affcb (Add login registration pages)
<<<<<<< HEAD
=======
=======
>>>>>>> 57a2e05 (Add login registration pages)
<<<<<<< HEAD
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57da3ff (Add login registration pages)
99.11%
>>>>>>> d0dc1f1 (Featire specs)
=======
90.68%
>>>>>>> 02a399d (Manifest_cache true)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
90.68%
>>>>>>> 02a399d (Manifest_cache true)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
90.68%
>>>>>>> 02a399d (Manifest_cache true)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
90.68%
>>>>>>> 02a399d (Manifest_cache true)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
90.68%
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
=======
41 files in total.
=======
34 files in total.
>>>>>>> bd8bda4 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> f764a87 (Fix book_spec decrease quantity and price)
=======
47 files in total.
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
52 files in total.
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 7d58507 (Add login registration pages)
400 relevant lines,
397 lines covered and
=======
377 relevant lines,
374 lines covered and
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
=======
52 files in total.
>>>>>>> e1f4d17 (Add login registration pages)
400 relevant lines,
397 lines covered and
>>>>>>> a624084 (Add login registration pages)
3 lines missed.
(
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a624084 (Add login registration pages)
99.11%
>>>>>>> 752f0c0 (Featire specs)
=======
=======
>>>>>>> f764a87 (Fix book_spec decrease quantity and price)
90.68%
<<<<<<< HEAD
=======
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
=======
41 files in total.
=======
34 files in total.
>>>>>>> bd8bda4 (Manifest_cache true)
=======
47 files in total.
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
52 files in total.
>>>>>>> e1f4d17 (Add login registration pages)
400 relevant lines,
397 lines covered and
=======
377 relevant lines,
374 lines covered and
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
=======
52 files in total.
>>>>>>> e1f4d17 (Add login registration pages)
400 relevant lines,
397 lines covered and
>>>>>>> a624084 (Add login registration pages)
>>>>>>> ccec311 (Add login registration pages)
=======
377 relevant lines,
374 lines covered and
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
=======
52 files in total.
>>>>>>> e1f4d17 (Add login registration pages)
400 relevant lines,
397 lines covered and
>>>>>>> 697ad44 (Add login registration pages)
3 lines missed.
(
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a624084 (Add login registration pages)
>>>>>>> ccec311 (Add login registration pages)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 697ad44 (Add login registration pages)
99.11%
>>>>>>> 752f0c0 (Featire specs)
=======
90.68%
>>>>>>> d96cf3b (Featire specs)
>>>>>>> bd8bda4 (Manifest_cache true)
=======
41 files in total.
=======
34 files in total.
>>>>>>> aa7b40c (Manifest_cache true)
=======
47 files in total.
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
52 files in total.
>>>>>>> 26b462d (Add login registration pages)
400 relevant lines,
397 lines covered and
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
377 relevant lines,
374 lines covered and
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
=======
52 files in total.
>>>>>>> 26b462d (Add login registration pages)
400 relevant lines,
397 lines covered and
>>>>>>> 0c3a150 (Add login registration pages)
3 lines missed.
(
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0c3a150 (Add login registration pages)
99.11%
>>>>>>> 4e81ea2 (Featire specs)
=======
90.68%
>>>>>>> aa7b40c (Manifest_cache true)
=======
52 files in total.
400 relevant lines,
397 lines covered and
3 lines missed.
(
99.25%
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 852864e (Add login registration pages)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 0fc3bf0 (Add login registration pages)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> 56a05fb (Featire specs)
=======
>>>>>>> bc0ff2c (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 039806b (Add login registration pages)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
=======
41 files in total.
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b459807 (Manifest_cache true)
=======
>>>>>>> caaaa41 (Manifest_cache true)
=======
34 files in total.
>>>>>>> 183b6c5 (Manifest_cache true)
=======
34 files in total.
>>>>>>> cde4834 (Manifest_cache true)
161 relevant lines,
146 lines covered and
15 lines missed.
(
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
99.11%
>>>>>>> 08edf50 (Featire specs)
=======
90.68%
>>>>>>> 183b6c5 (Manifest_cache true)
=======
99.2%
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
95.71%
>>>>>>> aca90e3 (Rebased)
=======
=======
=======
34 files in total.
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 926dfe5 (Manifest_cache true)
161 relevant lines,
146 lines covered and
15 lines missed.
(
<<<<<<< HEAD
=======
>>>>>>> b459807 (Manifest_cache true)
=======
>>>>>>> caaaa41 (Manifest_cache true)
99.11%
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> b459807 (Manifest_cache true)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> caaaa41 (Manifest_cache true)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> d96cf3b (Featire specs)
=======
=======
=======
90.68%
>>>>>>> 183b6c5 (Manifest_cache true)
=======
99.2%
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8be9029 (Add login registration pages)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> 551f3c1 (Add login registration pages)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 45f9f35 (Add login registration pages)
=======
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
>>>>>>> af9487a (Add login registration pages)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> f764a87 (Fix book_spec decrease quantity and price)
=======
=======
=======
99.25%
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> 9ca3b84 (Featire specs)
>>>>>>> 22ee41c (Add login registration pages)
<<<<<<< HEAD
>>>>>>> b6a32ab (Add login registration pages)
=======
=======
=======
>>>>>>> 6fa625b (Manifest_cache true)
95.71%
<<<<<<< HEAD
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> d780a52 (Rebased)
=======
=======
=======
41 files in total.
=======
34 files in total.
>>>>>>> 02a399d (Manifest_cache true)
=======
99.2%
=======
34 files in total.
>>>>>>> 7375d4b (Manifest_cache true)
=======
47 files in total.
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
52 files in total.
>>>>>>> 730a8ca (Add login registration pages)
400 relevant lines,
397 lines covered and
3 lines missed.
(
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
99.11%
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 83979de (Featire specs)
=======
=======
=======
90.68%
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b9cc4e9 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d0f5c14 (Manifest_cache true)
=======
=======
=======
90.68%
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> f5da5ac (Featire specs)
>>>>>>> 6fa625b (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> cfd1f7f (Manifest_cache true)
=======
=======
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> 3dc272d (Featire specs)
=======
=======
41 files in total.
=======
34 files in total.
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
=======
47 files in total.
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4f7c979 (Add login registration pages)
=======
52 files in total.
>>>>>>> e1f4d17 (Add login registration pages)
400 relevant lines,
397 lines covered and
=======
377 relevant lines,
374 lines covered and
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
=======
52 files in total.
>>>>>>> e1f4d17 (Add login registration pages)
400 relevant lines,
397 lines covered and
>>>>>>> a624084 (Add login registration pages)
3 lines missed.
(
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a624084 (Add login registration pages)
99.11%
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
=======
=======
=======
90.68%
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8cdb08 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e031bce (Manifest_cache true)
=======
=======
=======
=======
90.68%
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> df37394 (Featire specs)
=======
=======
90.68%
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> 715fac2 (Featire specs)
=======
41 files in total.
=======
34 files in total.
>>>>>>> aa7b40c (Manifest_cache true)
=======
47 files in total.
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
=======
52 files in total.
>>>>>>> 26b462d (Add login registration pages)
400 relevant lines,
397 lines covered and
3 lines missed.
(
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
99.11%
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 12bcf81 (Featire specs)
=======
=======
=======
90.68%
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 02ba384 (Manifest_cache true)
=======
=======
>>>>>>> 9ec6862 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 264ef06 (Add login registration pages)
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3e35e (Featire specs)
=======
=======
=======
90.68%
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 24b58e6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 926dfe5 (Manifest_cache true)
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c54769d (Fix book_spec decrease quantity and price)
=======
=======
=======
99.25%
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 57a2e05 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> a1a8477 (Add login registration pages)
=======
=======
=======
41 files in total.
=======
34 files in total.
>>>>>>> fd6db03 (Manifest_cache true)
=======
>>>>>>> 3dc272d (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
=======
52 files in total.
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> cb955a0 (Add login registration pages)
400 relevant lines,
397 lines covered and
3 lines missed.
(
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
99.11%
<<<<<<< HEAD
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 1677b1a (Featire specs)
=======
=======
=======
90.68%
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 00f8b58 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1830ff1 (Manifest_cache true)
=======
=======
=======
99.2%
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c346782 (Fix book_spec decrease quantity and price)
=======
=======
=======
99.25%
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> cacbab9 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 551615f (Add login registration pages)
=======
=======
>>>>>>> 49e8a6c (Rebased)
=======
49 files in total.
370 relevant lines,
257 lines covered and
113 lines missed.
(
69.46%
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d52ad35 (Rebased)
=======
=======
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
92 files in total.
=======
47 files in total.
>>>>>>> 7375d4b (Manifest_cache true)
=======
=======
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
92 files in total.
<<<<<<< HEAD
>>>>>>> d15fe1d (Fix)
=======
=======
47 files in total.
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> d66884b (Manifest_cache true)
1141 relevant lines,
1093 lines covered and
48 lines missed.
(
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d66884b (Manifest_cache true)
95.79%
<<<<<<< HEAD
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
=======
=======
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
90.68%
>>>>>>> bd8bda4 (Manifest_cache true)
=======
41 files in total.
=======
34 files in total.
>>>>>>> aa7b40c (Manifest_cache true)
=======
47 files in total.
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
=======
52 files in total.
>>>>>>> 26b462d (Add login registration pages)
400 relevant lines,
397 lines covered and
3 lines missed.
(
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
99.11%
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 3dc272d (Featire specs)
=======
90.68%
>>>>>>> aa7b40c (Manifest_cache true)
=======
52 files in total.
400 relevant lines,
397 lines covered and
3 lines missed.
(
99.25%
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> cb74525 (Add login registration pages)
=======
=======
=======
=======
>>>>>>> 5507b42 (Featire specs)
41 files in total.
=======
34 files in total.
<<<<<<< HEAD
>>>>>>> 02a399d (Manifest_cache true)
=======
99.2%
=======
34 files in total.
>>>>>>> 7375d4b (Manifest_cache true)
=======
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> ed97c39 (Manifest_cache true)
161 relevant lines,
146 lines covered and
15 lines missed.
(
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ed97c39 (Manifest_cache true)
99.11%
<<<<<<< HEAD
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
=======
=======
=======
90.68%
>>>>>>> 183b6c5 (Manifest_cache true)
=======
99.2%
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
=======
=======
99.25%
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 22ee41c (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e50f73e (Add login registration pages)
=======
=======
=======
>>>>>>> 6fa625b (Manifest_cache true)
95.71%
<<<<<<< HEAD
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> ee78f39 (Rebased)
=======
=======
=======
41 files in total.
=======
34 files in total.
>>>>>>> 02a399d (Manifest_cache true)
=======
99.2%
=======
34 files in total.
>>>>>>> 7375d4b (Manifest_cache true)
=======
47 files in total.
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
52 files in total.
>>>>>>> 730a8ca (Add login registration pages)
400 relevant lines,
397 lines covered and
3 lines missed.
(
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
99.11%
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
=======
=======
90.68%
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b9cc4e9 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 7945032 (Manifest_cache true)
=======
=======
=======
90.68%
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6fa625b (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0bdcc5e (Manifest_cache true)
=======
=======
=======
41 files in total.
=======
34 files in total.
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
=======
=======
47 files in total.
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
52 files in total.
>>>>>>> e1f4d17 (Add login registration pages)
400 relevant lines,
397 lines covered and
3 lines missed.
(
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
99.11%
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> a455e8a (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
47 files in total.
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
90.68%
>>>>>>> bd8bda4 (Manifest_cache true)
=======
41 files in total.
=======
34 files in total.
>>>>>>> aa7b40c (Manifest_cache true)
=======
47 files in total.
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
=======
52 files in total.
>>>>>>> 26b462d (Add login registration pages)
400 relevant lines,
397 lines covered and
3 lines missed.
(
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
99.11%
>>>>>>> 4e81ea2 (Featire specs)
=======
90.68%
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 59078f6 (Fix book_spec decrease quantity and price)
=======
52 files in total.
>>>>>>> e1f4d17 (Add login registration pages)
400 relevant lines,
397 lines covered and
3 lines missed.
(
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
99.11%
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 563720e (Featire specs)
=======
=======
=======
90.68%
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8cdb08 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b00b319 (Manifest_cache true)
=======
=======
=======
41 files in total.
=======
34 files in total.
>>>>>>> aa7b40c (Manifest_cache true)
=======
47 files in total.
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
=======
52 files in total.
>>>>>>> 26b462d (Add login registration pages)
400 relevant lines,
397 lines covered and
3 lines missed.
(
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
99.11%
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9bf83f (Featire specs)
=======
=======
=======
90.68%
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 86d584a (Manifest_cache true)
=======
=======
>>>>>>> 9ec6862 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> cb74525 (Add login registration pages)
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
=======
>>>>>>> caaaa41 (Manifest_cache true)
=======
>>>>>>> ed97c39 (Manifest_cache true)
=======
=======
90.68%
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 24b58e6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b459807 (Manifest_cache true)
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 45f9f35 (Add login registration pages)
=======
>>>>>>> 65459e8 (Add login registration pages)
=======
=======
99.25%
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 57a2e05 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8be9029 (Add login registration pages)
=======
=======
=======
41 files in total.
=======
34 files in total.
>>>>>>> fd6db03 (Manifest_cache true)
161 relevant lines,
146 lines covered and
15 lines missed.
(
<<<<<<< HEAD
99.11%
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
=======
=======
90.68%
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 00f8b58 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
=======
=======
99.2%
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
=======
99.25%
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> cacbab9 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 7d58507 (Add login registration pages)
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
=======
=======
90.68%
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
=======
=======
=======
90.68%
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
=======
=======
=======
41 files in total.
=======
34 files in total.
>>>>>>> bd8bda4 (Manifest_cache true)
161 relevant lines,
146 lines covered and
15 lines missed.
(
<<<<<<< HEAD
99.11%
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
=======
90.68%
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
=======
=======
=======
41 files in total.
=======
34 files in total.
>>>>>>> aa7b40c (Manifest_cache true)
161 relevant lines,
146 lines covered and
15 lines missed.
(
<<<<<<< HEAD
99.11%
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
=======
90.68%
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 35d17b9 (Manifest_cache true)
=======
=======
>>>>>>> f182ac7 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 852864e (Add login registration pages)
=======
=======
=======
41 files in total.
=======
34 files in total.
>>>>>>> 183b6c5 (Manifest_cache true)
161 relevant lines,
146 lines covered and
15 lines missed.
(
<<<<<<< HEAD
99.11%
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
=======
90.68%
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> add330c (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
=======
99.25%
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 57da3ff (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 551f3c1 (Add login registration pages)
=======
=======
=======
41 files in total.
=======
34 files in total.
>>>>>>> fd6db03 (Manifest_cache true)
161 relevant lines,
146 lines covered and
15 lines missed.
(
<<<<<<< HEAD
99.11%
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
=======
90.68%
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 15bff2e (Manifest_cache true)
=======
=======
=======
99.2%
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
=======
99.25%
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> a624084 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> ccec311 (Add login registration pages)
=======
=======
=======
41 files in total.
=======
34 files in total.
>>>>>>> 998f08d (Manifest_cache true)
161 relevant lines,
146 lines covered and
15 lines missed.
(
<<<<<<< HEAD
99.11%
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
=======
90.68%
>>>>>>> 998f08d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 6c71f00 (Manifest_cache true)
=======
=======
=======
99.2%
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
=======
=======
99.25%
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 6a9fede (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 8c3e531 (Add login registration pages)
=======
=======
112 files in total.
1338 relevant lines,
1277 lines covered and
61 lines missed.
(
<<<<<<< HEAD
95.74%
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
>>>>>>> 1d59aaa (Fix)
=======
=======
95.44%
>>>>>>> 446d79a (Fix)
>>>>>>> 851b4c0 (Fix)
=======
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
41 files in total.
=======
34 files in total.
>>>>>>> fd6db03 (Manifest_cache true)
161 relevant lines,
146 lines covered and
15 lines missed.
(
<<<<<<< HEAD
99.11%
<<<<<<< HEAD
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> 715fac2 (Featire specs)
=======
=======
=======
90.68%
>>>>>>> 183b6c5 (Manifest_cache true)
=======
99.2%
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
=======
=======
99.25%
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 22ee41c (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 03c0867 (Add login registration pages)
=======
=======
=======
>>>>>>> 6fa625b (Manifest_cache true)
95.71%
<<<<<<< HEAD
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> 836a973 (Rebased)
=======
=======
=======
41 files in total.
=======
34 files in total.
>>>>>>> 02a399d (Manifest_cache true)
=======
99.2%
=======
34 files in total.
>>>>>>> 7375d4b (Manifest_cache true)
161 relevant lines,
146 lines covered and
15 lines missed.
(
<<<<<<< HEAD
<<<<<<< HEAD
99.11%
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 2a25e4c (Featire specs)
=======
=======
=======
90.68%
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b9cc4e9 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 9bebee5 (Manifest_cache true)
=======
=======
=======
90.68%
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 6fa625b (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> ee5935f (Manifest_cache true)
=======
=======
=======
41 files in total.
=======
34 files in total.
>>>>>>> bd8bda4 (Manifest_cache true)
161 relevant lines,
146 lines covered and
15 lines missed.
(
<<<<<<< HEAD
99.11%
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 3e9f99d (Featire specs)
=======
=======
=======
90.68%
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> c8cdb08 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 394c6f3 (Manifest_cache true)
=======
=======
=======
41 files in total.
=======
34 files in total.
>>>>>>> aa7b40c (Manifest_cache true)
161 relevant lines,
146 lines covered and
15 lines missed.
(
<<<<<<< HEAD
99.11%
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5be567f (Featire specs)
=======
=======
=======
90.68%
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 4a0e3b6 (Manifest_cache true)
>>>>>>> 0b43b18 (Manifest_cache true)
=======
=======
>>>>>>> 9ec6862 (Add login registration pages)
>>>>>>> 039806b (Add login registration pages)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> caaaa41 (Manifest_cache true)
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 45f9f35 (Add login registration pages)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5506bd0 (Featire specs)
=======
=======
=======
90.68%
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 00f8b58 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8874887 (Manifest_cache true)
=======
=======
=======
99.2%
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
=======
=======
99.25%
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> cacbab9 (Add login registration pages)
>>>>>>> 697ad44 (Add login registration pages)
=======
=======
>>>>>>> bebaea7 (Rebased)
=======
49 files in total.
370 relevant lines,
257 lines covered and
113 lines missed.
(
69.46%
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
=======
=======
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
92 files in total.
=======
=======
>>>>>>> 3c386ca (Manifest_cache true)
=======
>>>>>>> 1cb2e82 (Featire specs)
=======
>>>>>>> fe7e312 (Manifest_cache true)
=======
>>>>>>> fb10fe4 (Add login registration pages)
114 files in total.
>>>>>>> c1749d5 (Featire specs)
=======
47 files in total.
>>>>>>> 7375d4b (Manifest_cache true)
1141 relevant lines,
1093 lines covered and
48 lines missed.
(
>>>>>>> f861b82 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 078304c (Rebased)
=======
95.79%
<<<<<<< HEAD
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> d15fe1d (Fix)
=======
=======
=======
41 files in total.
=======
34 files in total.
>>>>>>> 02a399d (Manifest_cache true)
=======
99.2%
=======
34 files in total.
>>>>>>> 7375d4b (Manifest_cache true)
=======
47 files in total.
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
52 files in total.
>>>>>>> 730a8ca (Add login registration pages)
400 relevant lines,
397 lines covered and
3 lines missed.
(
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
99.11%
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> b4763a2 (Featire specs)
=======
=======
=======
90.68%
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> dcf74e1 (Manifest_cache true)
=======
=======
=======
90.68%
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d66884b (Manifest_cache true)
=======
=======
=======
41 files in total.
=======
34 files in total.
>>>>>>> bd8bda4 (Manifest_cache true)
161 relevant lines,
146 lines covered and
15 lines missed.
(
<<<<<<< HEAD
99.11%
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> bcd09ab (Featire specs)
=======
=======
=======
90.68%
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 022e63e (Manifest_cache true)
=======
=======
=======
41 files in total.
=======
34 files in total.
>>>>>>> aa7b40c (Manifest_cache true)
161 relevant lines,
146 lines covered and
15 lines missed.
(
<<<<<<< HEAD
99.11%
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> c006a44 (Featire specs)
=======
=======
=======
90.68%
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 10bdfea (Manifest_cache true)
=======
=======
>>>>>>> f182ac7 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0fc3bf0 (Add login registration pages)
=======
=======
=======
41 files in total.
=======
34 files in total.
>>>>>>> 183b6c5 (Manifest_cache true)
161 relevant lines,
146 lines covered and
15 lines missed.
(
<<<<<<< HEAD
99.11%
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 848bfa2 (Featire specs)
=======
=======
=======
90.68%
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d70f030 (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
=======
=======
99.25%
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 57da3ff (Add login registration pages)
<<<<<<< HEAD
>>>>>>> af9487a (Add login registration pages)
=======
=======
=======
41 files in total.
=======
34 files in total.
>>>>>>> fd6db03 (Manifest_cache true)
161 relevant lines,
146 lines covered and
15 lines missed.
(
<<<<<<< HEAD
99.11%
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9ca3b84 (Featire specs)
=======
=======
=======
90.68%
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> cae047f (Manifest_cache true)
=======
=======
=======
99.2%
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
=======
=======
99.25%
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> a624084 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 140c987 (Add login registration pages)
=======
=======
=======
41 files in total.
=======
34 files in total.
>>>>>>> 998f08d (Manifest_cache true)
161 relevant lines,
146 lines covered and
15 lines missed.
(
<<<<<<< HEAD
99.11%
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> fefbd35 (Featire specs)
=======
=======
=======
90.68%
>>>>>>> 998f08d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a9e654b (Manifest_cache true)
=======
=======
=======
99.2%
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
=======
=======
99.25%
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 6a9fede (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 0c3a150 (Add login registration pages)
=======
=======
=======
>>>>>>> 9dc109d (Featire specs)
=======
>>>>>>> 866aee4 (Manifest_cache true)
=======
>>>>>>> 4e7b845 (Manifest_cache true)
112 files in total.
=======
47 files in total.
>>>>>>> 7375d4b (Manifest_cache true)
1338 relevant lines,
1277 lines covered and
61 lines missed.
(
<<<<<<< HEAD
<<<<<<< HEAD
95.74%
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
>>>>>>> 0b5b269 (Fix)
=======
=======
=======
>>>>>>> 4e7b845 (Manifest_cache true)
95.44%
<<<<<<< HEAD
>>>>>>> 446d79a (Fix)
<<<<<<< HEAD
>>>>>>> 8ad6192 (Fix)
=======
=======
=======
41 files in total.
=======
34 files in total.
>>>>>>> 02a399d (Manifest_cache true)
=======
99.2%
=======
34 files in total.
>>>>>>> 7375d4b (Manifest_cache true)
161 relevant lines,
146 lines covered and
15 lines missed.
(
<<<<<<< HEAD
<<<<<<< HEAD
99.11%
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9dc109d (Featire specs)
<<<<<<< HEAD
>>>>>>> d6f7da8 (Featire specs)
=======
=======
=======
90.68%
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 866aee4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> ab67c96 (Manifest_cache true)
=======
=======
=======
90.68%
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 4e7b845 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4e0a8d9 (Manifest_cache true)
=======
=======
=======
41 files in total.
=======
34 files in total.
>>>>>>> bd8bda4 (Manifest_cache true)
161 relevant lines,
146 lines covered and
15 lines missed.
(
<<<<<<< HEAD
99.11%
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
>>>>>>> f5da5ac (Featire specs)
=======
=======
=======
90.68%
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> b5f64c6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 036bb32 (Manifest_cache true)
=======
=======
=======
41 files in total.
=======
34 files in total.
>>>>>>> aa7b40c (Manifest_cache true)
161 relevant lines,
146 lines covered and
15 lines missed.
(
<<<<<<< HEAD
99.11%
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5f79779 (Featire specs)
=======
=======
=======
90.68%
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 8c7bad7 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3e8974a (Manifest_cache true)
=======
=======
>>>>>>> 01d9256 (Add login registration pages)
=======
=======
>>>>>>> fb10fe4 (Add login registration pages)
=======
52 files in total.
400 relevant lines,
397 lines covered and
3 lines missed.
(
99.25%
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 0005d4a (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 282f108 (Add login registration pages)
=======
=======
=======
41 files in total.
=======
34 files in total.
>>>>>>> 183b6c5 (Manifest_cache true)
161 relevant lines,
146 lines covered and
15 lines missed.
(
<<<<<<< HEAD
99.11%
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 56a05fb (Featire specs)
=======
=======
=======
90.68%
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 1bfc7a6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 23e9df9 (Manifest_cache true)
=======
=======
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
=======
=======
99.2%
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 055b00f (Add login registration pages)
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> da83d1a (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
>>>>>>> b26425c (Add login registration pages)
=======
=======
99.25%
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 58d403b (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> db0e854 (Add login registration pages)
=======
=======
=======
41 files in total.
=======
34 files in total.
>>>>>>> fd6db03 (Manifest_cache true)
161 relevant lines,
146 lines covered and
15 lines missed.
(
<<<<<<< HEAD
99.11%
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6d21330 (Featire specs)
=======
=======
=======
90.68%
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 3b839af (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9617beb (Manifest_cache true)
=======
=======
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
=======
=======
99.2%
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2a431e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 845289f (Add login registration pages)
=======
=======
99.25%
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> b575a28 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 2cdd6f4 (Add login registration pages)
=======
=======
=======
41 files in total.
=======
34 files in total.
>>>>>>> 998f08d (Manifest_cache true)
161 relevant lines,
146 lines covered and
15 lines missed.
(
<<<<<<< HEAD
99.11%
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 27e3351 (Featire specs)
=======
=======
=======
90.68%
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> 0832698 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b40a04e (Manifest_cache true)
=======
=======
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
=======
=======
99.2%
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e733663 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 569a007 (Add login registration pages)
=======
=======
99.25%
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 5caffae (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3a43955 (Add login registration pages)
=======
=======
>>>>>>> 49e3b70 (Fix)
=======
=======
>>>>>>> 65f3409 (Featire specs)
=======
>>>>>>> e991554 (Manifest_cache true)
=======
>>>>>>> b8aab1a (Manifest_cache true)
114 files in total.
=======
47 files in total.
>>>>>>> 7375d4b (Manifest_cache true)
1441 relevant lines,
1341 lines covered and
100 lines missed.
(
<<<<<<< HEAD
93.06%
<<<<<<< HEAD
>>>>>>> 8f1bc14 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1ac6be1 (Fix)
=======
90.68%
>>>>>>> cde4834 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 20256f8 (Featire specs)
41 files in total.
=======
34 files in total.
>>>>>>> fd6db03 (Manifest_cache true)
161 relevant lines,
146 lines covered and
15 lines missed.
(
<<<<<<< HEAD
99.11%
<<<<<<< HEAD
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> 3dc272d (Featire specs)
=======
=======
=======
90.68%
>>>>>>> 183b6c5 (Manifest_cache true)
=======
99.2%
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
=======
=======
=======
99.25%
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 22ee41c (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 27ceb6f (Add login registration pages)
=======
=======
=======
>>>>>>> 6fa625b (Manifest_cache true)
95.71%
<<<<<<< HEAD
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> 1577aeb (Rebased)
=======
=======
=======
41 files in total.
=======
34 files in total.
>>>>>>> 02a399d (Manifest_cache true)
=======
99.2%
=======
34 files in total.
>>>>>>> 7375d4b (Manifest_cache true)
161 relevant lines,
146 lines covered and
15 lines missed.
(
<<<<<<< HEAD
<<<<<<< HEAD
99.11%
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 8c32a77 (Featire specs)
=======
=======
=======
90.68%
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b9cc4e9 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 902b803 (Manifest_cache true)
=======
=======
=======
90.68%
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 6fa625b (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0c9131d (Manifest_cache true)
=======
=======
=======
41 files in total.
=======
34 files in total.
>>>>>>> bd8bda4 (Manifest_cache true)
161 relevant lines,
146 lines covered and
15 lines missed.
(
<<<<<<< HEAD
99.11%
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 56ef3ac (Featire specs)
=======
=======
=======
90.68%
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> c8cdb08 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b763f5b (Manifest_cache true)
=======
=======
=======
41 files in total.
=======
34 files in total.
>>>>>>> aa7b40c (Manifest_cache true)
161 relevant lines,
146 lines covered and
15 lines missed.
(
<<<<<<< HEAD
99.11%
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 113da87 (Featire specs)
=======
=======
=======
90.68%
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 4a0e3b6 (Manifest_cache true)
>>>>>>> be2f578 (Manifest_cache true)
=======
=======
>>>>>>> 9ec6862 (Add login registration pages)
>>>>>>> 2471c87 (Add login registration pages)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> ed97c39 (Manifest_cache true)
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 65459e8 (Add login registration pages)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 20256f8 (Featire specs)
=======
=======
=======
90.68%
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 00f8b58 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 587ce47 (Manifest_cache true)
=======
=======
=======
99.2%
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
=======
=======
99.25%
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> cacbab9 (Add login registration pages)
>>>>>>> cb955a0 (Add login registration pages)
=======
>>>>>>> bebaea7 (Rebased)
=======
=======
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
92 files in total.
=======
47 files in total.
>>>>>>> 7375d4b (Manifest_cache true)
1141 relevant lines,
1093 lines covered and
48 lines missed.
(
<<<<<<< HEAD
95.79%
<<<<<<< HEAD
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> eaef86a (Fix)
=======
=======
=======
41 files in total.
=======
34 files in total.
>>>>>>> 02a399d (Manifest_cache true)
=======
99.2%
=======
34 files in total.
>>>>>>> 7375d4b (Manifest_cache true)
161 relevant lines,
146 lines covered and
15 lines missed.
(
<<<<<<< HEAD
<<<<<<< HEAD
99.11%
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> b35d1f8 (Featire specs)
=======
=======
=======
90.68%
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 5518ff0 (Manifest_cache true)
=======
=======
=======
90.68%
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 75be480 (Manifest_cache true)
=======
=======
=======
41 files in total.
=======
34 files in total.
>>>>>>> bd8bda4 (Manifest_cache true)
161 relevant lines,
146 lines covered and
15 lines missed.
(
<<<<<<< HEAD
99.11%
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> a1fe6da (Featire specs)
=======
=======
=======
90.68%
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> 96aecde (Manifest_cache true)
>>>>>>> 027f794 (Manifest_cache true)
=======
=======
=======
41 files in total.
=======
34 files in total.
>>>>>>> aa7b40c (Manifest_cache true)
161 relevant lines,
146 lines covered and
15 lines missed.
(
<<<<<<< HEAD
99.11%
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 28fed3c (Featire specs)
=======
=======
=======
90.68%
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 2722d07 (Manifest_cache true)
>>>>>>> e2bfd89 (Manifest_cache true)
=======
=======
>>>>>>> f182ac7 (Add login registration pages)
>>>>>>> aeec696 (Add login registration pages)
=======
=======
=======
41 files in total.
=======
34 files in total.
>>>>>>> 183b6c5 (Manifest_cache true)
161 relevant lines,
146 lines covered and
15 lines missed.
(
<<<<<<< HEAD
99.11%
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ed6aebd (Featire specs)
=======
=======
=======
90.68%
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d1bae53 (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
=======
=======
99.25%
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 57da3ff (Add login registration pages)
<<<<<<< HEAD
>>>>>>> b5affcb (Add login registration pages)
=======
=======
=======
41 files in total.
=======
34 files in total.
>>>>>>> fd6db03 (Manifest_cache true)
161 relevant lines,
146 lines covered and
15 lines missed.
(
<<<<<<< HEAD
99.11%
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> 64d4167 (Featire specs)
=======
=======
=======
90.68%
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 35d9b13 (Manifest_cache true)
=======
=======
=======
99.2%
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
=======
=======
99.25%
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> a624084 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 4f7c979 (Add login registration pages)
=======
=======
=======
41 files in total.
=======
34 files in total.
>>>>>>> 998f08d (Manifest_cache true)
161 relevant lines,
146 lines covered and
15 lines missed.
(
<<<<<<< HEAD
99.11%
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 13fd74f (Featire specs)
=======
=======
=======
90.68%
>>>>>>> 998f08d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7f7abc (Manifest_cache true)
=======
=======
=======
99.2%
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
=======
=======
99.25%
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 6a9fede (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 60943cc (Add login registration pages)
=======
=======
=======
>>>>>>> 9dc109d (Featire specs)
=======
>>>>>>> 866aee4 (Manifest_cache true)
=======
>>>>>>> 4e7b845 (Manifest_cache true)
112 files in total.
=======
47 files in total.
>>>>>>> 7375d4b (Manifest_cache true)
1338 relevant lines,
1277 lines covered and
61 lines missed.
(
<<<<<<< HEAD
<<<<<<< HEAD
95.74%
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
>>>>>>> 1a9aba9 (Fix)
=======
=======
=======
>>>>>>> 4e7b845 (Manifest_cache true)
95.44%
<<<<<<< HEAD
>>>>>>> 446d79a (Fix)
<<<<<<< HEAD
>>>>>>> 4f1a459 (Fix)
=======
=======
=======
41 files in total.
=======
34 files in total.
>>>>>>> 02a399d (Manifest_cache true)
=======
99.2%
=======
34 files in total.
>>>>>>> 7375d4b (Manifest_cache true)
161 relevant lines,
146 lines covered and
15 lines missed.
(
<<<<<<< HEAD
<<<<<<< HEAD
99.11%
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9dc109d (Featire specs)
<<<<<<< HEAD
>>>>>>> dacfb20 (Featire specs)
=======
=======
=======
90.68%
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 866aee4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 459d812 (Manifest_cache true)
=======
=======
=======
90.68%
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 4e7b845 (Manifest_cache true)
>>>>>>> 3fef583 (Manifest_cache true)
=======
=======
=======
41 files in total.
=======
34 files in total.
>>>>>>> bd8bda4 (Manifest_cache true)
161 relevant lines,
146 lines covered and
15 lines missed.
(
<<<<<<< HEAD
99.11%
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
>>>>>>> 93db8b1 (Featire specs)
=======
=======
=======
90.68%
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> b5f64c6 (Manifest_cache true)
>>>>>>> b746b60 (Manifest_cache true)
=======
=======
=======
41 files in total.
=======
34 files in total.
>>>>>>> aa7b40c (Manifest_cache true)
161 relevant lines,
146 lines covered and
15 lines missed.
(
<<<<<<< HEAD
99.11%
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5f76842 (Featire specs)
=======
=======
=======
90.68%
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 8c7bad7 (Manifest_cache true)
>>>>>>> e965665 (Manifest_cache true)
=======
>>>>>>> 01d9256 (Add login registration pages)
=======
=======
=======
41 files in total.
=======
34 files in total.
>>>>>>> 183b6c5 (Manifest_cache true)
161 relevant lines,
146 lines covered and
15 lines missed.
(
<<<<<<< HEAD
99.11%
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
>>>>>>> ea0650c (Featire specs)
=======
=======
=======
90.68%
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 1bfc7a6 (Manifest_cache true)
>>>>>>> 10b6c72 (Manifest_cache true)
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
=======
>>>>>>> b26425c (Add login registration pages)
=======
=======
=======
41 files in total.
=======
34 files in total.
>>>>>>> fd6db03 (Manifest_cache true)
161 relevant lines,
146 lines covered and
15 lines missed.
(
<<<<<<< HEAD
99.11%
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
>>>>>>> a038b16 (Featire specs)
=======
=======
=======
90.68%
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 3b839af (Manifest_cache true)
>>>>>>> a77cc8a (Manifest_cache true)
=======
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 845289f (Add login registration pages)
=======
=======
=======
41 files in total.
=======
34 files in total.
>>>>>>> 998f08d (Manifest_cache true)
161 relevant lines,
146 lines covered and
15 lines missed.
(
<<<<<<< HEAD
99.11%
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
>>>>>>> d7fadcd (Featire specs)
=======
=======
=======
90.68%
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> 0832698 (Manifest_cache true)
>>>>>>> 39467b5 (Manifest_cache true)
=======
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 569a007 (Add login registration pages)
=======
>>>>>>> 49e3b70 (Fix)
=======
=======
=======
41 files in total.
=======
34 files in total.
>>>>>>> 02a399d (Manifest_cache true)
=======
99.2%
=======
34 files in total.
>>>>>>> 7375d4b (Manifest_cache true)
161 relevant lines,
146 lines covered and
15 lines missed.
(
<<<<<<< HEAD
<<<<<<< HEAD
99.11%
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 65f3409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 78d0719 (Featire specs)
=======
=======
=======
90.68%
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e991554 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 6edce20 (Manifest_cache true)
=======
=======
=======
90.68%
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> b8aab1a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 04108c4 (Manifest_cache true)
=======
=======
=======
41 files in total.
=======
34 files in total.
>>>>>>> bd8bda4 (Manifest_cache true)
161 relevant lines,
146 lines covered and
15 lines missed.
(
<<<<<<< HEAD
99.11%
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> c1749d5 (Featire specs)
<<<<<<< HEAD
>>>>>>> f861b82 (Featire specs)
=======
=======
=======
90.68%
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> 3c386ca (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d8298a1 (Manifest_cache true)
=======
=======
=======
41 files in total.
=======
34 files in total.
>>>>>>> aa7b40c (Manifest_cache true)
161 relevant lines,
146 lines covered and
15 lines missed.
(
<<<<<<< HEAD
99.11%
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 1cb2e82 (Featire specs)
<<<<<<< HEAD
>>>>>>> 2fd2048 (Featire specs)
=======
=======
=======
90.68%
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> fe7e312 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> bdea3aa (Manifest_cache true)
=======
=======
>>>>>>> fb10fe4 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 591c3b2 (Add login registration pages)
=======
=======
=======
41 files in total.
=======
34 files in total.
>>>>>>> 183b6c5 (Manifest_cache true)
161 relevant lines,
146 lines covered and
15 lines missed.
(
<<<<<<< HEAD
99.11%
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8577deb (Featire specs)
<<<<<<< HEAD
>>>>>>> bc0ff2c (Featire specs)
=======
=======
=======
90.68%
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 94d9078 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 07682bd (Manifest_cache true)
=======
=======
=======
99.2%
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 7b112c2 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 45f6de0 (Fix book_spec decrease quantity and price)
=======
=======
=======
99.25%
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 69eb97e (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 055b00f (Add login registration pages)
=======
=======
=======
41 files in total.
=======
34 files in total.
>>>>>>> fd6db03 (Manifest_cache true)
161 relevant lines,
146 lines covered and
15 lines missed.
(
<<<<<<< HEAD
99.11%
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> ebe5361 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9bf2aae (Featire specs)
=======
=======
=======
90.68%
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 2956182 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e2d040a (Manifest_cache true)
=======
=======
=======
99.2%
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> a455e8a (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 7718476 (Fix book_spec decrease quantity and price)
=======
=======
=======
99.25%
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 089f8cf (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e7ec208 (Add login registration pages)
=======
=======
=======
41 files in total.
=======
34 files in total.
>>>>>>> 998f08d (Manifest_cache true)
161 relevant lines,
146 lines covered and
15 lines missed.
(
<<<<<<< HEAD
99.11%
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> d3d58e0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5ce1a6d (Featire specs)
=======
=======
=======
90.68%
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> 9d9ff14 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 307ac6e (Manifest_cache true)
=======
=======
=======
99.2%
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 59078f6 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> cea736b (Fix book_spec decrease quantity and price)
=======
=======
=======
99.25%
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 0edd9b7 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 61908af (Add login registration pages)
=======
=======
120 files in total.
1523 relevant lines,
1408 lines covered and
115 lines missed.
(
92.45%
>>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
<<<<<<< HEAD
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
=======
=======
123 files in total.
1609 relevant lines,
1420 lines covered and
189 lines missed.
(
<<<<<<< HEAD
89.69%
>>>>>>> 708d0c9 (Checkout Add CreditCard Address Delivery method)
<<<<<<< HEAD
>>>>>>> 081d138 (Checkout Add CreditCard Address Delivery method)
=======
=======
88.25%
>>>>>>> 25f3c50 (Add sort orders)
>>>>>>> aa4fb26 (Add sort orders)
)
| File |
% covered |
Lines |
Relevant Lines |
Lines covered |
Lines missed |
Avg. Hits / Line |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 3dc272d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 3dc272d (Featire specs)
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 715fac2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
| app/admin/admin_users.rb |
40.00 % |
27 |
20 |
8 |
12 |
0.40 |
| app/admin/authors.rb |
100.00 % |
36 |
22 |
22 |
0 |
1.95 |
| app/admin/books.rb |
100.00 % |
57 |
41 |
41 |
0 |
2.49 |
| app/admin/categories.rb |
100.00 % |
31 |
18 |
18 |
0 |
2.17 |
| app/admin/dashboard.rb |
42.86 % |
14 |
7 |
3 |
4 |
4.71 |
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 715fac2 (Featire specs)
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 7945032 (Manifest_cache true)
=======
>>>>>>> 0bdcc5e (Manifest_cache true)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> b00b319 (Manifest_cache true)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> b459807 (Manifest_cache true)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> e9f3851 (Manifest_cache true)
=======
>>>>>>> 307f31f (Manifest_cache true)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> d782a28 (Manifest_cache true)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 35d17b9 (Manifest_cache true)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> add330c (Manifest_cache true)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 15bff2e (Manifest_cache true)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> 6c71f00 (Manifest_cache true)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
=======
=======
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> d96cf3b (Featire specs)
| app/controllers/application_controller.rb |
<<<<<<< HEAD
100.00 % |
2 |
1 |
=======
=======
=======
=======
=======
>>>>>>> a636fda (Featire specs)
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
>>>>>>> 6fa625b (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> c8cdb08 (Manifest_cache true)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
>>>>>>> bf554f4 (Rebased)
app/admin/admin_users.rb |
40.00 % |
27 |
20 |
8 |
12 |
0.40 |
| app/admin/authors.rb |
100.00 % |
36 |
22 |
22 |
0 |
1.95 |
| app/admin/books.rb |
100.00 % |
77 |
51 |
51 |
0 |
4.20 |
| app/admin/categories.rb |
100.00 % |
31 |
18 |
18 |
0 |
2.17 |
| app/admin/dashboard.rb |
42.86 % |
14 |
7 |
3 |
4 |
5.86 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c033601 (Rebased)
=======
=======
| app/controllers/home_controller.rb |
100.00 % |
12 |
7 |
7 |
0 |
1.86 |
<<<<<<< HEAD
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> a636fda (Featire specs)
=======
>>>>>>> bf554f4 (Rebased)
| app/controllers/application_controller.rb |
<<<<<<< HEAD
100.00 % |
2 |
1 |
<<<<<<< HEAD
=======
=======
=======
=======
=======
>>>>>>> a636fda (Featire specs)
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
>>>>>>> 6fa625b (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> c8cdb08 (Manifest_cache true)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
>>>>>>> bf554f4 (Rebased)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> b15044a (Manifest_cache true)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7c4ea7f (Fix)
app/admin/admin_users.rb |
40.00 % |
27 |
20 |
8 |
12 |
0.40 |
| app/admin/authors.rb |
100.00 % |
36 |
22 |
22 |
0 |
1.95 |
| app/admin/books.rb |
100.00 % |
77 |
51 |
51 |
0 |
4.20 |
| app/admin/categories.rb |
100.00 % |
31 |
18 |
18 |
0 |
2.17 |
| app/admin/coupons.rb |
100.00 % |
3 |
2 |
2 |
=======
<<<<<<< HEAD
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> aa7b40c (Manifest_cache true)
=======
app/controllers/application_controller.rb |
<<<<<<< HEAD
100.00 % |
2 |
1 |
=======
=======
=======
=======
=======
>>>>>>> a636fda (Featire specs)
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
>>>>>>> 6fa625b (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> c8cdb08 (Manifest_cache true)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
>>>>>>> bf554f4 (Rebased)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> b15044a (Manifest_cache true)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7c4ea7f (Fix)
=======
>>>>>>> 9dc109d (Featire specs)
=======
>>>>>>> 866aee4 (Manifest_cache true)
=======
>>>>>>> 4e7b845 (Manifest_cache true)
=======
>>>>>>> 864f339 (Featire specs)
=======
>>>>>>> b5f64c6 (Manifest_cache true)
=======
>>>>>>> a2de409 (Featire specs)
=======
>>>>>>> 8c7bad7 (Manifest_cache true)
=======
>>>>>>> e54ceb0 (Featire specs)
=======
>>>>>>> 1bfc7a6 (Manifest_cache true)
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
>>>>>>> 3b839af (Manifest_cache true)
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5a0bcc7 (Featire specs)
=======
>>>>>>> 0832698 (Manifest_cache true)
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8f1bc14 (Fix)
app/admin/admin_users.rb |
40.00 % |
27 |
20 |
8 |
12 |
0.40 |
| app/admin/authors.rb |
100.00 % |
36 |
22 |
22 |
0 |
1.95 |
| app/admin/books.rb |
100.00 % |
77 |
51 |
51 |
0 |
4.20 |
| app/admin/categories.rb |
100.00 % |
31 |
18 |
18 |
0 |
2.17 |
| app/admin/coupons.rb |
20.83 % |
36 |
24 |
5 |
19 |
0.21 |
| app/admin/dashboard.rb |
<<<<<<< HEAD
42.86 % |
14 |
7 |
3 |
4 |
5.86 |
=======
app/controllers/books_controller.rb |
100.00 % |
28 |
14 |
14 |
0 |
13.86 |
=======
app/controllers/books_controller.rb |
100.00 % |
24 |
12 |
12 |
0 |
13.50 |
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c033601 (Rebased)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
| app/controllers/home_controller.rb |
100.00 % |
12 |
7 |
7 |
0 |
1.86 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> a636fda (Featire specs)
=======
>>>>>>> bf554f4 (Rebased)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
| app/controllers/application_controller.rb |
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
app/decorators/author_decorator.rb |
>>>>>>> 02a399d (Manifest_cache true)
100.00 % |
7 |
4 |
4 |
0 |
1.50 |
| app/decorators/book_decorator.rb |
100.00 % |
=======
44.44 % |
>>>>>>> 7c4ea7f (Fix)
18 |
9 |
4 |
5 |
4.67 |
| app/admin/orders.rb |
19.23 % |
38 |
26 |
5 |
21 |
0.19 |
| app/controllers/application_controller.rb |
100.00 % |
15 |
10 |
10 |
0 |
53.00 |
| app/controllers/books_controller.rb |
93.75 % |
31 |
16 |
15 |
1 |
14.94 |
| app/controllers/checkouts_controller.rb |
100.00 % |
16 |
10 |
10 |
0 |
1.30 |
| app/controllers/coupons_controller.rb |
100.00 % |
14 |
8 |
8 |
0 |
2.88 |
| app/controllers/home_controller.rb |
100.00 % |
12 |
7 |
7 |
0 |
8.29 |
| app/controllers/order_books_controller.rb |
82.86 % |
62 |
35 |
29 |
6 |
1.74 |
| app/controllers/orders_controller.rb |
100.00 % |
14 |
8 |
8 |
0 |
3.38 |
| app/controllers/reviews_controller.rb |
100.00 % |
19 |
10 |
10 |
0 |
1.30 |
| app/controllers/users_controller.rb |
86.67 % |
31 |
15 |
13 |
2 |
2.93 |
| app/decorators/author_decorator.rb |
100.00 % |
7 |
4 |
4 |
0 |
1.50 |
| app/decorators/book_decorator.rb |
100.00 % |
23 |
12 |
<<<<<<< HEAD
<<<<<<< HEAD
12 |
0 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
24.50 |
=======
12.70 |
=======
90.00 % |
18 |
10 |
<<<<<<< HEAD
9 |
1 |
0.90 |
>>>>>>> ae2a012 (Manifest_cache true)
=======
10 |
0 |
12.90 |
>>>>>>> 1214e1f (Add login registration pages)
=======
27.58 |
>>>>>>> 7c4ea7f (Fix)
=======
27.50 |
>>>>>>> 446d79a (Fix)
=======
27.50 |
=======
12.70 |
=======
90.00 % |
18 |
10 |
<<<<<<< HEAD
9 |
1 |
0.90 |
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4e7b845 (Manifest_cache true)
=======
=======
10 |
0 |
12.90 |
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> 0005d4a (Add login registration pages)
=======
28.42 |
>>>>>>> 8f1bc14 (Fix)
| app/decorators/order_book_decorator.rb |
100.00 % |
9 |
5 |
5 |
0 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
1.00 |
>>>>>>> 7375d4b (Manifest_cache true)
=======
12 |
0 |
<<<<<<< HEAD
25.67 |
<<<<<<< HEAD
>>>>>>> a5d032d (Fix)
=======
=======
12.70 |
=======
90.00 % |
18 |
10 |
<<<<<<< HEAD
9 |
1 |
0.90 |
>>>>>>> ae2a012 (Manifest_cache true)
=======
10 |
0 |
12.90 |
>>>>>>> 1214e1f (Add login registration pages)
=======
2.60 |
>>>>>>> 7c4ea7f (Fix)
=======
2.40 |
>>>>>>> 446d79a (Fix)
=======
2.60 |
>>>>>>> 8f1bc14 (Fix)
<<<<<<< HEAD
| app/decorators/category_decorator.rb |
100.00 % |
<<<<<<< HEAD
3 |
2 |
2 |
0 |
1.00 |
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
app/decorators/order_decorator.rb |
100.00 % |
13 |
8 |
8 |
0 |
<<<<<<< HEAD
<<<<<<< HEAD
14.75 |
>>>>>>> 7c4ea7f (Fix)
=======
13.75 |
>>>>>>> 446d79a (Fix)
=======
17.75 |
>>>>>>> 8f1bc14 (Fix)
| app/decorators/paginating_decorator.rb |
100.00 % |
3 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
5 |
>>>>>>> ae2a012 (Manifest_cache true)
=======
>>>>>>> 7c4ea7f (Fix)
=======
=======
5 |
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 4e7b845 (Manifest_cache true)
=======
>>>>>>> 8f1bc14 (Fix)
2 |
2 |
<<<<<<< HEAD
=======
app/controllers/application_controller.rb |
=======
app/decorators/author_decorator.rb |
>>>>>>> aa7b40c (Manifest_cache true)
=======
app/decorators/author_decorator.rb |
>>>>>>> cde4834 (Manifest_cache true)
100.00 % |
7 |
4 |
4 |
0 |
1.25 |
| app/decorators/book_decorator.rb |
90.00 % |
18 |
10 |
9 |
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
1 |
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 715fac2 (Featire specs)
0 |
1.00 |
<<<<<<< HEAD
| app/admin/dashboard.rb |
<<<<<<< HEAD
42.86 % |
14 |
7 |
3 |
4 |
5.86 |
=======
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 715fac2 (Featire specs)
app/controllers/books_controller.rb |
100.00 % |
28 |
14 |
14 |
0 |
<<<<<<< HEAD
13.86 |
=======
app/controllers/books_controller.rb |
100.00 % |
=======
13.36 |
<<<<<<< HEAD
=======
=======
=======
app/controllers/books_controller.rb |
100.00 % |
>>>>>>> 4e81ea2 (Featire specs)
=======
app/controllers/books_controller.rb |
100.00 % |
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 715fac2 (Featire specs)
24 |
12 |
12 |
0 |
13.50 |
<<<<<<< HEAD
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c033601 (Rebased)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
| app/controllers/home_controller.rb |
100.00 % |
12 |
7 |
7 |
0 |
1.86 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> a636fda (Featire specs)
=======
>>>>>>> bf554f4 (Rebased)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
| app/controllers/application_controller.rb |
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
app/decorators/author_decorator.rb |
>>>>>>> 02a399d (Manifest_cache true)
100.00 % |
7 |
4 |
4 |
0 |
1.50 |
| app/decorators/book_decorator.rb |
100.00 % |
=======
44.44 % |
>>>>>>> 7c4ea7f (Fix)
18 |
9 |
4 |
5 |
4.67 |
| app/admin/orders.rb |
100.00 % |
3 |
2 |
2 |
0 |
1.00 |
| app/controllers/application_controller.rb |
100.00 % |
15 |
10 |
10 |
0 |
47.20 |
| app/controllers/books_controller.rb |
93.75 % |
31 |
16 |
15 |
1 |
14.94 |
| app/controllers/coupons_controller.rb |
100.00 % |
14 |
8 |
8 |
0 |
2.88 |
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
13.86 |
>>>>>>> 1214e1f (Add login registration pages)
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 715fac2 (Featire specs)
| app/controllers/home_controller.rb |
100.00 % |
12 |
7 |
7 |
0 |
6.14 |
| app/controllers/order_books_controller.rb |
80.65 % |
54 |
31 |
25 |
6 |
1.81 |
| app/controllers/orders_controller.rb |
100.00 % |
7 |
4 |
4 |
0 |
2.50 |
| app/controllers/reviews_controller.rb |
100.00 % |
19 |
10 |
10 |
0 |
1.30 |
| app/controllers/users_controller.rb |
86.67 % |
31 |
15 |
13 |
2 |
2.93 |
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 715fac2 (Featire specs)
| app/decorators/author_decorator.rb |
100.00 % |
7 |
4 |
4 |
0 |
1.50 |
| app/decorators/book_decorator.rb |
100.00 % |
23 |
12 |
<<<<<<< HEAD
<<<<<<< HEAD
12 |
0 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
24.50 |
=======
12.70 |
=======
90.00 % |
18 |
10 |
<<<<<<< HEAD
9 |
1 |
0.90 |
>>>>>>> ae2a012 (Manifest_cache true)
=======
10 |
0 |
12.90 |
>>>>>>> 1214e1f (Add login registration pages)
=======
27.58 |
>>>>>>> 7c4ea7f (Fix)
=======
27.50 |
>>>>>>> 446d79a (Fix)
| app/decorators/order_book_decorator.rb |
100.00 % |
9 |
5 |
5 |
0 |
<<<<<<< HEAD
<<<<<<< HEAD
1.00 |
>>>>>>> 7375d4b (Manifest_cache true)
=======
12 |
0 |
<<<<<<< HEAD
25.67 |
<<<<<<< HEAD
>>>>>>> a5d032d (Fix)
=======
=======
12.70 |
=======
90.00 % |
18 |
10 |
<<<<<<< HEAD
9 |
1 |
0.90 |
>>>>>>> ae2a012 (Manifest_cache true)
=======
10 |
0 |
12.90 |
>>>>>>> 1214e1f (Add login registration pages)
=======
2.60 |
>>>>>>> 7c4ea7f (Fix)
=======
2.40 |
>>>>>>> 446d79a (Fix)
<<<<<<< HEAD
| app/decorators/category_decorator.rb |
100.00 % |
<<<<<<< HEAD
3 |
2 |
2 |
0 |
1.00 |
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
app/decorators/order_decorator.rb |
100.00 % |
13 |
8 |
8 |
0 |
<<<<<<< HEAD
14.75 |
>>>>>>> 7c4ea7f (Fix)
=======
13.75 |
>>>>>>> 446d79a (Fix)
| app/decorators/paginating_decorator.rb |
100.00 % |
3 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
5 |
>>>>>>> ae2a012 (Manifest_cache true)
=======
>>>>>>> 7c4ea7f (Fix)
2 |
2 |
<<<<<<< HEAD
=======
app/controllers/application_controller.rb |
=======
app/decorators/author_decorator.rb |
>>>>>>> aa7b40c (Manifest_cache true)
100.00 % |
7 |
4 |
4 |
0 |
1.25 |
| app/decorators/book_decorator.rb |
90.00 % |
18 |
10 |
9 |
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
1 |
<<<<<<< HEAD
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> aa7b40c (Manifest_cache true)
=======
app/controllers/application_controller.rb |
<<<<<<< HEAD
100.00 % |
2 |
1 |
=======
=======
=======
=======
=======
>>>>>>> a636fda (Featire specs)
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
>>>>>>> 6fa625b (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> c8cdb08 (Manifest_cache true)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
>>>>>>> bf554f4 (Rebased)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> b15044a (Manifest_cache true)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7c4ea7f (Fix)
=======
>>>>>>> 9dc109d (Featire specs)
=======
>>>>>>> 866aee4 (Manifest_cache true)
=======
>>>>>>> 4e7b845 (Manifest_cache true)
=======
>>>>>>> 864f339 (Featire specs)
=======
>>>>>>> b5f64c6 (Manifest_cache true)
=======
>>>>>>> a2de409 (Featire specs)
=======
>>>>>>> 8c7bad7 (Manifest_cache true)
=======
>>>>>>> e54ceb0 (Featire specs)
=======
>>>>>>> 1bfc7a6 (Manifest_cache true)
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
>>>>>>> 3b839af (Manifest_cache true)
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5a0bcc7 (Featire specs)
=======
>>>>>>> 0832698 (Manifest_cache true)
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8f1bc14 (Fix)
=======
>>>>>>> 65f3409 (Featire specs)
=======
>>>>>>> e991554 (Manifest_cache true)
=======
>>>>>>> b8aab1a (Manifest_cache true)
=======
>>>>>>> c1749d5 (Featire specs)
=======
>>>>>>> 3c386ca (Manifest_cache true)
=======
>>>>>>> 1cb2e82 (Featire specs)
=======
>>>>>>> fe7e312 (Manifest_cache true)
=======
>>>>>>> 8577deb (Featire specs)
=======
>>>>>>> 94d9078 (Manifest_cache true)
=======
>>>>>>> 7b112c2 (Fix book_spec decrease quantity and price)
=======
>>>>>>> ebe5361 (Featire specs)
=======
>>>>>>> 2956182 (Manifest_cache true)
=======
>>>>>>> a455e8a (Fix book_spec decrease quantity and price)
=======
>>>>>>> d3d58e0 (Featire specs)
=======
>>>>>>> 9d9ff14 (Manifest_cache true)
=======
>>>>>>> 59078f6 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
app/admin/admin_users.rb |
40.00 % |
27 |
20 |
8 |
12 |
0.40 |
| app/admin/authors.rb |
100.00 % |
36 |
22 |
22 |
0 |
1.95 |
| app/admin/books.rb |
100.00 % |
77 |
51 |
51 |
0 |
4.20 |
| app/admin/categories.rb |
100.00 % |
31 |
18 |
18 |
0 |
2.17 |
| app/admin/coupons.rb |
20.83 % |
36 |
24 |
5 |
19 |
0.21 |
| app/admin/dashboard.rb |
<<<<<<< HEAD
42.86 % |
14 |
7 |
3 |
4 |
5.86 |
=======
app/controllers/books_controller.rb |
100.00 % |
28 |
14 |
14 |
0 |
13.86 |
=======
app/controllers/books_controller.rb |
100.00 % |
24 |
12 |
12 |
0 |
13.50 |
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c033601 (Rebased)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
| app/controllers/home_controller.rb |
100.00 % |
12 |
7 |
7 |
0 |
1.86 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> a636fda (Featire specs)
=======
>>>>>>> bf554f4 (Rebased)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
| app/controllers/application_controller.rb |
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
app/decorators/author_decorator.rb |
>>>>>>> 02a399d (Manifest_cache true)
100.00 % |
7 |
4 |
4 |
0 |
1.50 |
| app/decorators/book_decorator.rb |
100.00 % |
=======
44.44 % |
>>>>>>> 7c4ea7f (Fix)
18 |
9 |
4 |
5 |
4.67 |
| app/admin/deliveries.rb |
30.00 % |
33 |
20 |
6 |
14 |
0.30 |
| app/admin/orders.rb |
18.52 % |
39 |
27 |
5 |
22 |
0.19 |
| app/controllers/application_controller.rb |
100.00 % |
29 |
18 |
18 |
0 |
52.06 |
| app/controllers/books_controller.rb |
93.75 % |
31 |
16 |
15 |
1 |
14.94 |
| app/controllers/checkouts_controller.rb |
47.76 % |
125 |
67 |
32 |
35 |
0.69 |
| app/controllers/coupons_controller.rb |
100.00 % |
16 |
9 |
9 |
0 |
3.00 |
| app/controllers/home_controller.rb |
100.00 % |
12 |
7 |
7 |
0 |
8.29 |
| app/controllers/order_books_controller.rb |
82.86 % |
62 |
35 |
29 |
6 |
1.74 |
| app/controllers/orders_controller.rb |
33.33 % |
59 |
33 |
11 |
22 |
0.70 |
| app/controllers/reviews_controller.rb |
100.00 % |
19 |
10 |
10 |
0 |
1.30 |
| app/controllers/users_controller.rb |
80.95 % |
43 |
21 |
17 |
4 |
3.00 |
| app/decorators/author_decorator.rb |
100.00 % |
7 |
4 |
4 |
0 |
1.50 |
| app/decorators/book_decorator.rb |
100.00 % |
23 |
12 |
<<<<<<< HEAD
<<<<<<< HEAD
12 |
0 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
24.50 |
=======
12.70 |
=======
90.00 % |
18 |
10 |
<<<<<<< HEAD
9 |
1 |
0.90 |
>>>>>>> ae2a012 (Manifest_cache true)
=======
10 |
0 |
12.90 |
>>>>>>> 1214e1f (Add login registration pages)
=======
27.58 |
>>>>>>> 7c4ea7f (Fix)
=======
27.50 |
>>>>>>> 446d79a (Fix)
=======
27.50 |
=======
12.70 |
=======
90.00 % |
18 |
10 |
<<<<<<< HEAD
9 |
1 |
0.90 |
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4e7b845 (Manifest_cache true)
=======
=======
10 |
0 |
12.90 |
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> 0005d4a (Add login registration pages)
=======
28.42 |
>>>>>>> 8f1bc14 (Fix)
=======
28.42 |
=======
12.70 |
=======
90.00 % |
18 |
10 |
<<<<<<< HEAD
9 |
1 |
0.90 |
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b8aab1a (Manifest_cache true)
=======
=======
10 |
0 |
12.90 |
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> fb10fe4 (Add login registration pages)
=======
28.42 |
>>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
=======
28.50 |
>>>>>>> 25f3c50 (Add sort orders)
| app/decorators/delivery_decorator.rb |
75.00 % |
7 |
4 |
3 |
1 |
0.75 |
| app/decorators/order_book_decorator.rb |
100.00 % |
9 |
5 |
5 |
0 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
1.00 |
>>>>>>> 7375d4b (Manifest_cache true)
=======
12 |
0 |
<<<<<<< HEAD
25.67 |
<<<<<<< HEAD
>>>>>>> a5d032d (Fix)
=======
=======
12.70 |
=======
90.00 % |
18 |
10 |
<<<<<<< HEAD
9 |
1 |
0.90 |
>>>>>>> ae2a012 (Manifest_cache true)
=======
10 |
0 |
12.90 |
>>>>>>> 1214e1f (Add login registration pages)
=======
2.60 |
>>>>>>> 7c4ea7f (Fix)
=======
2.40 |
>>>>>>> 446d79a (Fix)
=======
2.60 |
>>>>>>> 8f1bc14 (Fix)
=======
2.80 |
>>>>>>> 25f3c50 (Add sort orders)
<<<<<<< HEAD
| app/decorators/category_decorator.rb |
100.00 % |
<<<<<<< HEAD
3 |
2 |
2 |
0 |
1.00 |
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
app/decorators/order_decorator.rb |
<<<<<<< HEAD
<<<<<<< HEAD
100.00 % |
13 |
8 |
8 |
0 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
14.75 |
>>>>>>> 7c4ea7f (Fix)
=======
13.75 |
>>>>>>> 446d79a (Fix)
=======
17.75 |
>>>>>>> 8f1bc14 (Fix)
=======
19.25 |
>>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
=======
90.00 % |
17 |
10 |
9 |
1 |
15.50 |
>>>>>>> 708d0c9 (Checkout Add CreditCard Address Delivery method)
=======
78.57 % |
25 |
14 |
11 |
3 |
11.79 |
>>>>>>> 25f3c50 (Add sort orders)
| app/decorators/paginating_decorator.rb |
100.00 % |
3 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
5 |
>>>>>>> ae2a012 (Manifest_cache true)
=======
>>>>>>> 7c4ea7f (Fix)
=======
=======
5 |
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 4e7b845 (Manifest_cache true)
=======
>>>>>>> 8f1bc14 (Fix)
=======
=======
5 |
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> b8aab1a (Manifest_cache true)
=======
>>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
2 |
2 |
<<<<<<< HEAD
=======
app/controllers/application_controller.rb |
=======
app/decorators/author_decorator.rb |
>>>>>>> aa7b40c (Manifest_cache true)
100.00 % |
7 |
4 |
4 |
0 |
1.25 |
| app/decorators/book_decorator.rb |
90.00 % |
18 |
10 |
9 |
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
1 |
<<<<<<< HEAD
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d15fe1d (Fix)
=======
2 |
2 |
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> d15fe1d (Fix)
0 |
1.00 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 836a973 (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
| app/controllers/books_controller.rb |
<<<<<<< HEAD
93.75 % |
31 |
16 |
15 |
1 |
13.94 |
=======
100.00 % |
28 |
14 |
14 |
0 |
13.36 |
<<<<<<< HEAD
=======
=======
=======
app/controllers/books_controller.rb |
<<<<<<< HEAD
=======
app/decorators/review_decorator.rb |
100.00 % |
7 |
4 |
4 |
0 |
1.00 |
| app/decorators/user_decorator.rb |
>>>>>>> c033601 (Rebased)
100.00 % |
9 |
5 |
5 |
0 |
1.40 |
<<<<<<< HEAD
=======
1.86 |
>>>>>>> d0dc1f1 (Featire specs)
=======
1.86 |
>>>>>>> 752f0c0 (Featire specs)
=======
1.86 |
>>>>>>> 4e81ea2 (Featire specs)
=======
1.86 |
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
=======
8 |
4 |
0.67 |
>>>>>>> bf554f4 (Rebased)
=======
=======
=======
>>>>>>> 836a973 (Rebased)
app/decorators/review_decorator.rb |
100.00 % |
7 |
4 |
4 |
0 |
1.00 |
| app/decorators/user_decorator.rb |
<<<<<<< HEAD
=======
>>>>>>> c033601 (Rebased)
>>>>>>> 836a973 (Rebased)
100.00 % |
9 |
5 |
5 |
0 |
1.40 |
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a5d032d (Fix)
=======
=======
1.86 |
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9620751 (Featire specs)
=======
=======
1.86 |
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 59d75f9 (Featire specs)
=======
=======
1.86 |
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
=======
=======
1.86 |
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> 7c4ea7f (Fix)
=======
>>>>>>> 836a973 (Rebased)
| app/helpers/application_helper.rb |
100.00 % |
<<<<<<< HEAD
7 |
4 |
4 |
0 |
5.00 |
=======
5 |
3 |
3 |
0 |
4.67 |
>>>>>>> 836a973 (Rebased)
| app/helpers/constants.rb |
100.00 % |
27 |
21 |
21 |
0 |
1.00 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a5d032d (Fix)
=======
>>>>>>> 836a973 (Rebased)
| app/interactors/billing_update.rb |
87.50 % |
14 |
8 |
7 |
1 |
0.88 |
| app/interactors/shipping_update.rb |
87.50 % |
14 |
8 |
7 |
1 |
0.88 |
| app/interactors/user_update.rb |
100.00 % |
25 |
13 |
13 |
0 |
3.00 |
<<<<<<< HEAD
| app/jobs/application_job.rb |
100.00 % |
7 |
1 |
1 |
=======
<<<<<<< HEAD
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> aa7b40c (Manifest_cache true)
=======
app/controllers/application_controller.rb |
100.00 % |
2 |
1 |
1 |
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> 3dc272d (Featire specs)
=======
=======
>>>>>>> c033601 (Rebased)
>>>>>>> 1577aeb (Rebased)
0 |
1.00 |
<<<<<<< HEAD
<<<<<<< HEAD
| app/jobs/cart_cleaner.rb |
60.00 % |
8 |
5 |
3 |
2 |
0.60 |
=======
>>>>>>> 836a973 (Rebased)
| app/models/address.rb |
=======
=======
>>>>>>> 1577aeb (Rebased)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
app/controllers/books_controller.rb |
>>>>>>> 3dc272d (Featire specs)
100.00 % |
24 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 836a973 (Rebased)
12 |
12 |
0 |
13.50 |
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
13.86 |
>>>>>>> 1214e1f (Add login registration pages)
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
| app/controllers/home_controller.rb |
100.00 % |
12 |
7 |
7 |
0 |
6.14 |
| app/controllers/reviews_controller.rb |
100.00 % |
19 |
10 |
10 |
0 |
1.30 |
| app/controllers/users_controller.rb |
86.67 % |
31 |
15 |
13 |
2 |
2.93 |
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> df37394 (Featire specs)
| app/decorators/author_decorator.rb |
100.00 % |
7 |
4 |
4 |
0 |
1.50 |
| app/decorators/book_decorator.rb |
100.00 % |
23 |
12 |
<<<<<<< HEAD
<<<<<<< HEAD
12 |
0 |
<<<<<<< HEAD
24.50 |
=======
12.70 |
=======
90.00 % |
18 |
10 |
<<<<<<< HEAD
9 |
1 |
0.90 |
>>>>>>> ae2a012 (Manifest_cache true)
=======
10 |
0 |
12.90 |
>>>>>>> 1214e1f (Add login registration pages)
=======
1 |
0.90 |
>>>>>>> cde4834 (Manifest_cache true)
| app/decorators/category_decorator.rb |
100.00 % |
<<<<<<< HEAD
<<<<<<< HEAD
3 |
2 |
2 |
0 |
=======
7 |
7 |
0 |
>>>>>>> c033601 (Rebased)
1.00 |
>>>>>>> 7375d4b (Manifest_cache true)
=======
12 |
0 |
25.67 |
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
| app/decorators/paginating_decorator.rb |
100.00 % |
3 |
<<<<<<< HEAD
=======
5 |
>>>>>>> ae2a012 (Manifest_cache true)
2 |
2 |
<<<<<<< HEAD
=======
app/controllers/application_controller.rb |
=======
app/decorators/author_decorator.rb |
>>>>>>> aa7b40c (Manifest_cache true)
100.00 % |
7 |
4 |
4 |
0 |
1.25 |
| app/decorators/book_decorator.rb |
90.00 % |
18 |
10 |
9 |
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
1 |
<<<<<<< HEAD
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> aa7b40c (Manifest_cache true)
=======
app/controllers/application_controller.rb |
100.00 % |
2 |
1 |
1 |
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
>>>>>>> c033601 (Rebased)
=======
2 |
2 |
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
0 |
=======
7 |
7 |
0 |
>>>>>>> a5d032d (Fix)
1.00 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d15fe1d (Fix)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
| app/controllers/books_controller.rb |
93.33 % |
30 |
15 |
14 |
<<<<<<< HEAD
14 |
0 |
13.36 |
<<<<<<< HEAD
=======
<<<<<<< HEAD
1 |
14.13 |
>>>>>>> aca90e3 (Rebased)
=======
<<<<<<< HEAD
=======
=======
=======
app/controllers/books_controller.rb |
=======
app/decorators/review_decorator.rb |
100.00 % |
7 |
4 |
4 |
=======
5 |
2 |
2 |
>>>>>>> cde4834 (Manifest_cache true)
0 |
1.00 |
<<<<<<< HEAD
| app/decorators/user_decorator.rb |
>>>>>>> c033601 (Rebased)
100.00 % |
9 |
5 |
5 |
0 |
1.40 |
<<<<<<< HEAD
=======
1.86 |
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
1.86 |
>>>>>>> 752f0c0 (Featire specs)
=======
1.86 |
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
1.86 |
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 078304c (Rebased)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
8 |
4 |
0.67 |
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d15fe1d (Fix)
=======
app/decorators/review_decorator.rb |
100.00 % |
7 |
4 |
4 |
0 |
1.00 |
<<<<<<< HEAD
=======
>>>>>>> 2a25e4c (Featire specs)
=======
=======
1.86 |
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
=======
1.86 |
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> 078304c (Rebased)
=======
| app/decorators/user_decorator.rb |
100.00 % |
9 |
5 |
5 |
0 |
1.40 |
>>>>>>> a5d032d (Fix)
>>>>>>> d15fe1d (Fix)
| app/decorators/user_decorator.rb |
100.00 % |
9 |
5 |
5 |
0 |
1.40 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a5d032d (Fix)
=======
=======
1.86 |
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9620751 (Featire specs)
=======
=======
1.86 |
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 59d75f9 (Featire specs)
=======
=======
1.86 |
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
=======
=======
1.86 |
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> 7c4ea7f (Fix)
=======
=======
1.86 |
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9dc109d (Featire specs)
=======
=======
1.86 |
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 864f339 (Featire specs)
=======
=======
1.86 |
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> a2de409 (Featire specs)
=======
=======
1.86 |
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54ceb0 (Featire specs)
=======
=======
1.86 |
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 95ebdc2 (Featire specs)
=======
=======
1.86 |
>>>>>>> 4552227 (Featire specs)
>>>>>>> 5a0bcc7 (Featire specs)
=======
>>>>>>> 8f1bc14 (Fix)
=======
>>>>>>> 872e675 (Fix)
| app/helpers/application_helper.rb |
100.00 % |
7 |
4 |
4 |
0 |
5.00 |
| app/helpers/constants.rb |
100.00 % |
27 |
21 |
21 |
=======
>>>>>>> eaef86a (Fix)
0 |
1.00 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a5d032d (Fix)
| app/interactors/billing_update.rb |
87.50 % |
14 |
8 |
7 |
1 |
0.88 |
| app/interactors/shipping_update.rb |
87.50 % |
14 |
8 |
7 |
1 |
0.88 |
| app/interactors/user_update.rb |
100.00 % |
25 |
13 |
13 |
0 |
3.00 |
| app/jobs/application_job.rb |
100.00 % |
7 |
1 |
1 |
0 |
1.00 |
| app/jobs/cart_cleaner.rb |
60.00 % |
8 |
5 |
3 |
2 |
0.60 |
| app/models/address.rb |
100.00 % |
24 |
<<<<<<< HEAD
<<<<<<< HEAD
12 |
12 |
0 |
13.50 |
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
13.86 |
>>>>>>> 1214e1f (Add login registration pages)
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> d96cf3b (Featire specs)
| app/controllers/home_controller.rb |
100.00 % |
12 |
7 |
7 |
0 |
6.14 |
| app/controllers/reviews_controller.rb |
100.00 % |
17 |
9 |
9 |
0 |
1.33 |
| app/controllers/users_controller.rb |
86.67 % |
31 |
15 |
13 |
2 |
2.93 |
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> d96cf3b (Featire specs)
| app/decorators/author_decorator.rb |
100.00 % |
7 |
4 |
4 |
0 |
1.50 |
| app/decorators/book_decorator.rb |
100.00 % |
23 |
12 |
12 |
0 |
<<<<<<< HEAD
12.70 |
| app/decorators/category_decorator.rb |
100.00 % |
3 |
2 |
2 |
0 |
=======
7 |
7 |
0 |
>>>>>>> c033601 (Rebased)
1.00 |
=======
24.50 |
>>>>>>> aca90e3 (Rebased)
<<<<<<< HEAD
| app/decorators/paginating_decorator.rb |
100.00 % |
3 |
2 |
2 |
0 |
=======
7 |
7 |
0 |
>>>>>>> a5d032d (Fix)
1.00 |
<<<<<<< HEAD
| app/decorators/review_decorator.rb |
100.00 % |
7 |
4 |
4 |
0 |
1.00 |
| app/decorators/user_decorator.rb |
100.00 % |
9 |
5 |
5 |
0 |
1.40 |
=======
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
| app/helpers/application_helper.rb |
100.00 % |
7 |
4 |
4 |
0 |
4.00 |
| app/helpers/constants.rb |
100.00 % |
27 |
21 |
21 |
0 |
1.00 |
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a5d032d (Fix)
| app/interactors/billing_update.rb |
87.50 % |
14 |
8 |
7 |
1 |
0.88 |
| app/interactors/shipping_update.rb |
87.50 % |
14 |
8 |
7 |
1 |
0.88 |
| app/interactors/user_update.rb |
100.00 % |
25 |
13 |
13 |
0 |
3.00 |
| app/models/address.rb |
100.00 % |
24 |
<<<<<<< HEAD
7 |
7 |
0 |
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
=======
app/controllers/books_controller.rb |
=======
app/decorators/review_decorator.rb |
100.00 % |
7 |
4 |
4 |
0 |
1.00 |
| app/decorators/user_decorator.rb |
>>>>>>> c033601 (Rebased)
100.00 % |
9 |
5 |
5 |
0 |
1.40 |
<<<<<<< HEAD
=======
1.86 |
>>>>>>> d0dc1f1 (Featire specs)
=======
1.86 |
>>>>>>> 752f0c0 (Featire specs)
=======
1.86 |
>>>>>>> 4e81ea2 (Featire specs)
=======
1.86 |
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
=======
8 |
4 |
0.67 |
>>>>>>> bf554f4 (Rebased)
=======
app/decorators/review_decorator.rb |
100.00 % |
7 |
4 |
4 |
0 |
1.00 |
| app/decorators/user_decorator.rb |
100.00 % |
9 |
5 |
5 |
0 |
1.40 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a5d032d (Fix)
=======
=======
1.86 |
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9620751 (Featire specs)
=======
=======
1.86 |
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 59d75f9 (Featire specs)
=======
=======
1.86 |
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
=======
=======
1.86 |
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> 7c4ea7f (Fix)
=======
=======
1.86 |
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9dc109d (Featire specs)
=======
=======
1.86 |
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 864f339 (Featire specs)
=======
=======
1.86 |
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> a2de409 (Featire specs)
=======
=======
1.86 |
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54ceb0 (Featire specs)
=======
=======
1.86 |
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 95ebdc2 (Featire specs)
=======
=======
1.86 |
>>>>>>> 4552227 (Featire specs)
>>>>>>> 5a0bcc7 (Featire specs)
=======
>>>>>>> 8f1bc14 (Fix)
=======
=======
1.86 |
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 65f3409 (Featire specs)
=======
=======
1.86 |
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> c1749d5 (Featire specs)
=======
=======
1.86 |
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 1cb2e82 (Featire specs)
=======
=======
1.86 |
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 8577deb (Featire specs)
=======
=======
1.86 |
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> ebe5361 (Featire specs)
=======
=======
1.86 |
>>>>>>> 4552227 (Featire specs)
>>>>>>> d3d58e0 (Featire specs)
=======
>>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
| app/helpers/application_helper.rb |
100.00 % |
7 |
4 |
4 |
0 |
5.00 |
| app/helpers/constants.rb |
100.00 % |
33 |
26 |
26 |
0 |
1.00 |
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a5d032d (Fix)
| app/interactors/billing_update.rb |
87.50 % |
14 |
8 |
7 |
1 |
0.88 |
| app/interactors/shipping_update.rb |
87.50 % |
14 |
8 |
7 |
1 |
0.88 |
| app/interactors/user_update.rb |
100.00 % |
25 |
13 |
13 |
0 |
3.08 |
| app/jobs/cart_cleaner_job.rb |
66.67 % |
9 |
6 |
4 |
2 |
0.67 |
| app/models/address.rb |
100.00 % |
24 |
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3dc272d (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 1577aeb (Rebased)
=======
<<<<<<< HEAD
>>>>>>> eaef86a (Fix)
12 |
12 |
0 |
13.50 |
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
13.86 |
>>>>>>> 1214e1f (Add login registration pages)
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
| app/controllers/home_controller.rb |
100.00 % |
12 |
7 |
7 |
0 |
1.86 |
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
| app/decorators/author_decorator.rb |
100.00 % |
7 |
4 |
4 |
0 |
<<<<<<< HEAD
1.25 |
=======
<<<<<<< HEAD
1.50 |
=======
1.25 |
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
| app/decorators/book_decorator.rb |
<<<<<<< HEAD
90.00 % |
18 |
10 |
9 |
1 |
0.90 |
=======
<<<<<<< HEAD
100.00 % |
18 |
10 |
10 |
0 |
12.70 |
=======
90.00 % |
18 |
10 |
9 |
1 |
0.90 |
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
| app/decorators/category_decorator.rb |
100.00 % |
<<<<<<< HEAD
5 |
=======
<<<<<<< HEAD
3 |
2 |
2 |
0 |
=======
7 |
7 |
0 |
>>>>>>> c033601 (Rebased)
1.00 |
<<<<<<< HEAD
| app/decorators/paginating_decorator.rb |
100.00 % |
3 |
=======
5 |
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
2 |
2 |
0 |
=======
7 |
7 |
0 |
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> d15fe1d (Fix)
=======
>>>>>>> eaef86a (Fix)
1.00 |
<<<<<<< HEAD
<<<<<<< HEAD
| app/models/admin_user.rb |
=======
<<<<<<< HEAD
=======
>>>>>>> eaef86a (Fix)
app/helpers/application_helper.rb |
>>>>>>> d15fe1d (Fix)
100.00 % |
6 |
2 |
2 |
<<<<<<< HEAD
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
app/helpers/application_helper.rb |
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a5d032d (Fix)
=======
>>>>>>> 49e8a6c (Rebased)
=======
=======
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 836a973 (Rebased)
=======
=======
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
>>>>>>> 078304c (Rebased)
=======
=======
>>>>>>> a5d032d (Fix)
>>>>>>> d15fe1d (Fix)
=======
>>>>>>> 1577aeb (Rebased)
=======
=======
>>>>>>> bf554f4 (Rebased)
>>>>>>> bebaea7 (Rebased)
=======
=======
>>>>>>> a5d032d (Fix)
>>>>>>> eaef86a (Fix)
app/models/admin_user.rb |
>>>>>>> c033601 (Rebased)
100.00 % |
6 |
<<<<<<< HEAD
2 |
2 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 078304c (Rebased)
=======
>>>>>>> b4763a2 (Featire specs)
=======
>>>>>>> 0b5b269 (Fix)
=======
>>>>>>> d6f7da8 (Featire specs)
=======
>>>>>>> 1ac6be1 (Fix)
=======
>>>>>>> 49e3b70 (Fix)
=======
>>>>>>> 78d0719 (Featire specs)
=======
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
>>>>>>> bd8bda4 (Manifest_cache true)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
=======
>>>>>>> cde4834 (Manifest_cache true)
app/helpers/application_helper.rb |
100.00 % |
3 |
2 |
2 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> aa7b40c (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> 56a05fb (Featire specs)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> bc0ff2c (Featire specs)
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
>>>>>>> c033601 (Rebased)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b4763a2 (Featire specs)
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 9dc109d (Featire specs)
=======
>>>>>>> 65f3409 (Featire specs)
=======
6 |
4 |
4 |
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b4763a2 (Featire specs)
=======
>>>>>>> dcf74e1 (Manifest_cache true)
=======
>>>>>>> d6f7da8 (Featire specs)
=======
>>>>>>> ab67c96 (Manifest_cache true)
=======
>>>>>>> 78d0719 (Featire specs)
=======
>>>>>>> 6edce20 (Manifest_cache true)
>>>>>>> a636fda (Featire specs)
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 866aee4 (Manifest_cache true)
=======
>>>>>>> e991554 (Manifest_cache true)
=======
app/helpers/application_helper.rb |
100.00 % |
3 |
2 |
2 |
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> dcf74e1 (Manifest_cache true)
=======
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> ab67c96 (Manifest_cache true)
=======
>>>>>>> f5da5ac (Featire specs)
=======
>>>>>>> 6edce20 (Manifest_cache true)
=======
>>>>>>> f861b82 (Featire specs)
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 864f339 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f5da5ac (Featire specs)
=======
>>>>>>> c1749d5 (Featire specs)
=======
>>>>>>> f861b82 (Featire specs)
6 |
4 |
4 |
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> 3dc272d (Featire specs)
=======
=======
=======
2 |
2 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
app/helpers/application_helper.rb |
<<<<<<< HEAD
<<<<<<< HEAD
=======
app/models/admin_user.rb |
>>>>>>> c033601 (Rebased)
100.00 % |
6 |
<<<<<<< HEAD
=======
100.00 % |
6 |
>>>>>>> 715fac2 (Featire specs)
=======
100.00 % |
6 |
>>>>>>> 3dc272d (Featire specs)
4 |
4 |
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
=======
=======
>>>>>>> f5da5ac (Featire specs)
=======
>>>>>>> 036bb32 (Manifest_cache true)
=======
>>>>>>> f861b82 (Featire specs)
=======
>>>>>>> d8298a1 (Manifest_cache true)
>>>>>>> d2e6b3c (Featire specs)
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
>>>>>>> d782a28 (Manifest_cache true)
=======
>>>>>>> b5f64c6 (Manifest_cache true)
=======
>>>>>>> 3c386ca (Manifest_cache true)
=======
app/helpers/application_helper.rb |
100.00 % |
3 |
=======
>>>>>>> ee78f39 (Rebased)
2 |
2 |
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8cdb08 (Manifest_cache true)
=======
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> a2de409 (Featire specs)
=======
>>>>>>> 1cb2e82 (Featire specs)
=======
6 |
4 |
4 |
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 2722d07 (Manifest_cache true)
>>>>>>> 35d17b9 (Manifest_cache true)
=======
>>>>>>> 8c7bad7 (Manifest_cache true)
=======
>>>>>>> fe7e312 (Manifest_cache true)
=======
app/helpers/application_helper.rb |
100.00 % |
3 |
2 |
2 |
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 56a05fb (Featire specs)
=======
=======
>>>>>>> 8577deb (Featire specs)
>>>>>>> bc0ff2c (Featire specs)
6 |
4 |
4 |
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 1bfc7a6 (Manifest_cache true)
=======
>>>>>>> 94d9078 (Manifest_cache true)
=======
app/helpers/application_helper.rb |
100.00 % |
3 |
2 |
2 |
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 24b58e6 (Manifest_cache true)
=======
=======
>>>>>>> 3b03895 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 6d21330 (Featire specs)
=======
>>>>>>> ebe5361 (Featire specs)
=======
>>>>>>> 9bf2aae (Featire specs)
6 |
4 |
4 |
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 15bff2e (Manifest_cache true)
=======
>>>>>>> 6d21330 (Featire specs)
=======
>>>>>>> 9617beb (Manifest_cache true)
=======
>>>>>>> 9bf2aae (Featire specs)
=======
>>>>>>> e2d040a (Manifest_cache true)
>>>>>>> 9c0d812 (Featire specs)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
>>>>>>> 3b839af (Manifest_cache true)
=======
>>>>>>> 2956182 (Manifest_cache true)
=======
app/helpers/application_helper.rb |
100.00 % |
3 |
2 |
2 |
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 00f8b58 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> bf554f4 (Rebased)
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
=======
=======
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ee78f39 (Rebased)
=======
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
=======
=======
=======
>>>>>>> 8c32a77 (Featire specs)
6 |
4 |
4 |
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
=======
=======
=======
>>>>>>> a636fda (Featire specs)
=======
=======
>>>>>>> 9bebee5 (Manifest_cache true)
app/helpers/application_helper.rb |
100.00 % |
3 |
2 |
2 |
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> b9cc4e9 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 7945032 (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
=======
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> 3dc272d (Featire specs)
=======
app/helpers/application_helper.rb |
100.00 % |
3 |
2 |
2 |
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8cdb08 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b00b319 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> bcd09ab (Featire specs)
6 |
4 |
4 |
<<<<<<< HEAD
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9bf83f (Featire specs)
=======
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 715fac2 (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 3dc272d (Featire specs)
=======
app/helpers/application_helper.rb |
100.00 % |
3 |
2 |
2 |
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 86d584a (Manifest_cache true)
=======
=======
=======
>>>>>>> 848bfa2 (Featire specs)
=======
=======
>>>>>>> e54ceb0 (Featire specs)
>>>>>>> ea0650c (Featire specs)
6 |
4 |
4 |
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
=======
=======
app/helpers/application_helper.rb |
100.00 % |
3 |
2 |
2 |
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 24b58e6 (Manifest_cache true)
>>>>>>> b459807 (Manifest_cache true)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
=======
>>>>>>> bf554f4 (Rebased)
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 35d17b9 (Manifest_cache true)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> add330c (Manifest_cache true)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 15bff2e (Manifest_cache true)
=======
=======
=======
app/helpers/application_helper.rb |
100.00 % |
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
=======
=======
>>>>>>> d3d58e0 (Featire specs)
6 |
4 |
4 |
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
=======
>>>>>>> 0832698 (Manifest_cache true)
=======
>>>>>>> 9d9ff14 (Manifest_cache true)
=======
app/helpers/application_helper.rb |
100.00 % |
3 |
2 |
2 |
>>>>>>> 998f08d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6c71f00 (Manifest_cache true)
=======
=======
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
>>>>>>> 1d59aaa (Fix)
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 715fac2 (Featire specs)
=======
=======
>>>>>>> c033601 (Rebased)
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 9bebee5 (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 022e63e (Manifest_cache true)
>>>>>>> d2e6b3c (Featire specs)
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
app/helpers/application_helper.rb |
100.00 % |
3 |
2 |
2 |
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8cdb08 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 394c6f3 (Manifest_cache true)
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
=======
6 |
4 |
4 |
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5be567f (Featire specs)
=======
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
>>>>>>> 10bdfea (Manifest_cache true)
=======
app/helpers/application_helper.rb |
100.00 % |
3 |
2 |
2 |
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0b43b18 (Manifest_cache true)
=======
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 9dc109d (Featire specs)
=======
6 |
4 |
4 |
<<<<<<< HEAD
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 2ee03d3 (Featire specs)
=======
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
app/helpers/application_helper.rb |
100.00 % |
3 |
2 |
2 |
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 24b58e6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> caaaa41 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 9ca3b84 (Featire specs)
6 |
4 |
4 |
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5506bd0 (Featire specs)
=======
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
<<<<<<< HEAD
app/helpers/application_helper.rb |
100.00 % |
3 |
2 |
2 |
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 00f8b58 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8874887 (Manifest_cache true)
=======
=======
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
>>>>>>> 078304c (Rebased)
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> b4763a2 (Featire specs)
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> dcf74e1 (Manifest_cache true)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> bcd09ab (Featire specs)
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 022e63e (Manifest_cache true)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> c006a44 (Featire specs)
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 10bdfea (Manifest_cache true)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 848bfa2 (Featire specs)
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d70f030 (Manifest_cache true)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9ca3b84 (Featire specs)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
>>>>>>> cae047f (Manifest_cache true)
=======
=======
app/helpers/application_helper.rb |
100.00 % |
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
6 |
4 |
4 |
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> fefbd35 (Featire specs)
=======
=======
=======
>>>>>>> 0832698 (Manifest_cache true)
=======
app/helpers/application_helper.rb |
100.00 % |
3 |
2 |
2 |
>>>>>>> 998f08d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b15044a (Manifest_cache true)
>>>>>>> a9e654b (Manifest_cache true)
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 0b5b269 (Fix)
=======
=======
>>>>>>> 9dc109d (Featire specs)
<<<<<<< HEAD
>>>>>>> d6f7da8 (Featire specs)
=======
=======
>>>>>>> 866aee4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> ab67c96 (Manifest_cache true)
=======
=======
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
>>>>>>> f5da5ac (Featire specs)
=======
=======
>>>>>>> b5f64c6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 036bb32 (Manifest_cache true)
=======
=======
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5f79779 (Featire specs)
=======
=======
>>>>>>> 8c7bad7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 3e8974a (Manifest_cache true)
=======
=======
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 56a05fb (Featire specs)
=======
=======
>>>>>>> 1bfc7a6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 23e9df9 (Manifest_cache true)
=======
=======
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6d21330 (Featire specs)
=======
=======
>>>>>>> 3b839af (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 9617beb (Manifest_cache true)
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 27e3351 (Featire specs)
=======
=======
>>>>>>> 0832698 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b40a04e (Manifest_cache true)
=======
=======
>>>>>>> 8f1bc14 (Fix)
<<<<<<< HEAD
>>>>>>> 1ac6be1 (Fix)
=======
>>>>>>> cde4834 (Manifest_cache true)
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 3dc272d (Featire specs)
=======
=======
>>>>>>> c033601 (Rebased)
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 866aee4 (Manifest_cache true)
=======
app/helpers/application_helper.rb |
100.00 % |
3 |
2 |
2 |
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b9cc4e9 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 902b803 (Manifest_cache true)
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 864f339 (Featire specs)
=======
6 |
4 |
4 |
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 56ef3ac (Featire specs)
=======
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> b5f64c6 (Manifest_cache true)
=======
app/helpers/application_helper.rb |
100.00 % |
3 |
2 |
2 |
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8cdb08 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b763f5b (Manifest_cache true)
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> a2de409 (Featire specs)
=======
6 |
4 |
4 |
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 113da87 (Featire specs)
=======
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> 8c7bad7 (Manifest_cache true)
=======
app/helpers/application_helper.rb |
100.00 % |
3 |
2 |
2 |
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> be2f578 (Manifest_cache true)
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
6 |
4 |
4 |
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 8b420cf (Featire specs)
=======
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 1bfc7a6 (Manifest_cache true)
=======
app/helpers/application_helper.rb |
100.00 % |
3 |
2 |
2 |
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 24b58e6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> ed97c39 (Manifest_cache true)
=======
=======
=======
>>>>>>> 3b03895 (Featire specs)
=======
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
>>>>>>> a038b16 (Featire specs)
6 |
4 |
4 |
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 20256f8 (Featire specs)
=======
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
>>>>>>> 3b839af (Manifest_cache true)
=======
<<<<<<< HEAD
app/helpers/application_helper.rb |
100.00 % |
3 |
2 |
2 |
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 00f8b58 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 587ce47 (Manifest_cache true)
=======
=======
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
>>>>>>> bebaea7 (Rebased)
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> b35d1f8 (Featire specs)
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 5518ff0 (Manifest_cache true)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> a1fe6da (Featire specs)
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 027f794 (Manifest_cache true)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 28fed3c (Featire specs)
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e2bfd89 (Manifest_cache true)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ed6aebd (Featire specs)
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d1bae53 (Manifest_cache true)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> 64d4167 (Featire specs)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 35d9b13 (Manifest_cache true)
=======
=======
=======
app/helpers/application_helper.rb |
100.00 % |
6 |
4 |
4 |
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 13fd74f (Featire specs)
=======
=======
=======
app/helpers/application_helper.rb |
100.00 % |
3 |
2 |
2 |
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7f7abc (Manifest_cache true)
=======
=======
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
>>>>>>> 1a9aba9 (Fix)
=======
=======
>>>>>>> 9dc109d (Featire specs)
<<<<<<< HEAD
>>>>>>> dacfb20 (Featire specs)
=======
=======
>>>>>>> 866aee4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 459d812 (Manifest_cache true)
=======
=======
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
>>>>>>> 93db8b1 (Featire specs)
=======
=======
>>>>>>> b5f64c6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b746b60 (Manifest_cache true)
=======
=======
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5f76842 (Featire specs)
=======
=======
>>>>>>> 8c7bad7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e965665 (Manifest_cache true)
=======
=======
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
>>>>>>> ea0650c (Featire specs)
=======
=======
>>>>>>> 1bfc7a6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 10b6c72 (Manifest_cache true)
=======
=======
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
>>>>>>> a038b16 (Featire specs)
=======
=======
>>>>>>> 3b839af (Manifest_cache true)
>>>>>>> a77cc8a (Manifest_cache true)
=======
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
>>>>>>> d7fadcd (Featire specs)
=======
=======
>>>>>>> 0832698 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 39467b5 (Manifest_cache true)
=======
=======
>>>>>>> 8f1bc14 (Fix)
>>>>>>> 49e3b70 (Fix)
=======
=======
>>>>>>> 65f3409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 78d0719 (Featire specs)
=======
=======
>>>>>>> e991554 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 6edce20 (Manifest_cache true)
=======
=======
>>>>>>> c1749d5 (Featire specs)
<<<<<<< HEAD
>>>>>>> f861b82 (Featire specs)
=======
=======
>>>>>>> 3c386ca (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d8298a1 (Manifest_cache true)
=======
=======
>>>>>>> 1cb2e82 (Featire specs)
<<<<<<< HEAD
>>>>>>> 2fd2048 (Featire specs)
=======
=======
>>>>>>> fe7e312 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> bdea3aa (Manifest_cache true)
=======
=======
>>>>>>> 8577deb (Featire specs)
<<<<<<< HEAD
>>>>>>> bc0ff2c (Featire specs)
=======
=======
>>>>>>> 94d9078 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 07682bd (Manifest_cache true)
=======
=======
>>>>>>> ebe5361 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9bf2aae (Featire specs)
=======
=======
>>>>>>> 2956182 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e2d040a (Manifest_cache true)
=======
=======
>>>>>>> d3d58e0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5ce1a6d (Featire specs)
=======
=======
>>>>>>> 9d9ff14 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 307ac6e (Manifest_cache true)
=======
=======
>>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
0 |
1.00 |
| app/models/application_record.rb |
100.00 % |
3 |
2 |
2 |
0 |
1.00 |
| app/models/author.rb |
100.00 % |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> b35d1f8 (Featire specs)
=======
>>>>>>> a1fe6da (Featire specs)
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> dacfb20 (Featire specs)
=======
>>>>>>> 93db8b1 (Featire specs)
=======
>>>>>>> 5f76842 (Featire specs)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> d7fadcd (Featire specs)
=======
>>>>>>> 78d0719 (Featire specs)
=======
>>>>>>> f861b82 (Featire specs)
=======
>>>>>>> 2fd2048 (Featire specs)
=======
>>>>>>> bc0ff2c (Featire specs)
=======
>>>>>>> 9bf2aae (Featire specs)
=======
>>>>>>> 5ce1a6d (Featire specs)
6 |
4 |
4 |
=======
7 |
5 |
5 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> cde4834 (Manifest_cache true)
=======
6 |
4 |
4 |
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8c32a77 (Featire specs)
=======
=======
>>>>>>> a1fe6da (Featire specs)
=======
>>>>>>> 93db8b1 (Featire specs)
=======
>>>>>>> f861b82 (Featire specs)
=======
7 |
5 |
5 |
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 56ef3ac (Featire specs)
=======
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> 5f76842 (Featire specs)
=======
>>>>>>> 2fd2048 (Featire specs)
=======
7 |
5 |
5 |
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 113da87 (Featire specs)
=======
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> bc0ff2c (Featire specs)
=======
7 |
5 |
5 |
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8b420cf (Featire specs)
=======
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> 9bf2aae (Featire specs)
=======
7 |
5 |
5 |
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> b35d1f8 (Featire specs)
=======
>>>>>>> a1fe6da (Featire specs)
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> 64d4167 (Featire specs)
=======
=======
>>>>>>> d7fadcd (Featire specs)
=======
>>>>>>> 5ce1a6d (Featire specs)
=======
7 |
5 |
5 |
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 13fd74f (Featire specs)
=======
6 |
4 |
4 |
>>>>>>> 1a9aba9 (Fix)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> dacfb20 (Featire specs)
=======
>>>>>>> 93db8b1 (Featire specs)
=======
>>>>>>> 5f76842 (Featire specs)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> d7fadcd (Featire specs)
=======
6 |
4 |
4 |
>>>>>>> 49e3b70 (Fix)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 78d0719 (Featire specs)
=======
>>>>>>> f861b82 (Featire specs)
=======
>>>>>>> 2fd2048 (Featire specs)
=======
>>>>>>> bc0ff2c (Featire specs)
=======
>>>>>>> 9bf2aae (Featire specs)
=======
>>>>>>> 5ce1a6d (Featire specs)
=======
6 |
4 |
4 |
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
0 |
1.00 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> cde4834 (Manifest_cache true)
| app/models/authors_book.rb |
100.00 % |
6 |
4 |
4 |
0 |
1.00 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 20256f8 (Featire specs)
| app/models/billing.rb |
100.00 % |
2 |
1 |
1 |
=======
6 |
4 |
4 |
>>>>>>> bebaea7 (Rebased)
=======
app/models/authors_book.rb |
100.00 % |
6 |
4 |
4 |
>>>>>>> eaef86a (Fix)
0 |
1.00 |
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d15fe1d (Fix)
=======
=======
>>>>>>> b35d1f8 (Featire specs)
=======
>>>>>>> a1fe6da (Featire specs)
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> 1a9aba9 (Fix)
=======
>>>>>>> dacfb20 (Featire specs)
=======
>>>>>>> 93db8b1 (Featire specs)
=======
>>>>>>> 5f76842 (Featire specs)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> d7fadcd (Featire specs)
=======
>>>>>>> 49e3b70 (Fix)
=======
>>>>>>> 78d0719 (Featire specs)
=======
>>>>>>> f861b82 (Featire specs)
=======
>>>>>>> 2fd2048 (Featire specs)
=======
>>>>>>> bc0ff2c (Featire specs)
=======
>>>>>>> 9bf2aae (Featire specs)
=======
>>>>>>> 5ce1a6d (Featire specs)
=======
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
| app/models/billing.rb |
100.00 % |
2 |
1 |
1 |
0 |
1.00 |
>>>>>>> eaef86a (Fix)
| app/models/book.rb |
100.00 % |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
17 |
=======
app/models/book.rb |
100.00 % |
13 |
>>>>>>> d0dc1f1 (Featire specs)
=======
app/models/book.rb |
100.00 % |
13 |
>>>>>>> 752f0c0 (Featire specs)
=======
app/models/book.rb |
100.00 % |
13 |
>>>>>>> 4e81ea2 (Featire specs)
=======
app/models/book.rb |
100.00 % |
13 |
>>>>>>> 08edf50 (Featire specs)
=======
app/models/book.rb |
100.00 % |
13 |
>>>>>>> 7a02bbe (Featire specs)
=======
app/models/book.rb |
100.00 % |
13 |
>>>>>>> 4552227 (Featire specs)
9 |
9 |
=======
15 |
8 |
8 |
<<<<<<< HEAD
>>>>>>> ee78f39 (Rebased)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 4552227 (Featire specs)
=======
>>>>>>> cde4834 (Manifest_cache true)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 20256f8 (Featire specs)
app/models/book.rb |
100.00 % |
13 |
9 |
9 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 20256f8 (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 563720e (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9bf83f (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
0 |
1.00 |
| app/models/books_category.rb |
100.00 % |
6 |
4 |
4 |
=======
17 |
=======
app/models/book.rb |
100.00 % |
13 |
>>>>>>> d0dc1f1 (Featire specs)
=======
app/models/book.rb |
100.00 % |
13 |
>>>>>>> 752f0c0 (Featire specs)
=======
app/models/book.rb |
100.00 % |
13 |
>>>>>>> 4e81ea2 (Featire specs)
=======
app/models/book.rb |
100.00 % |
13 |
>>>>>>> 08edf50 (Featire specs)
=======
app/models/book.rb |
100.00 % |
13 |
>>>>>>> 7a02bbe (Featire specs)
=======
app/models/book.rb |
100.00 % |
13 |
>>>>>>> 4552227 (Featire specs)
9 |
9 |
>>>>>>> 49e8a6c (Rebased)
=======
19 |
10 |
10 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1d59aaa (Fix)
=======
app/models/book.rb |
100.00 % |
<<<<<<< HEAD
15 |
8 |
8 |
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 836a973 (Rebased)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 8c32a77 (Featire specs)
app/models/book.rb |
100.00 % |
13 |
9 |
9 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 2a25e4c (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 3e9f99d (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5be567f (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 2ee03d3 (Featire specs)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
0 |
1.00 |
| app/models/books_category.rb |
100.00 % |
6 |
4 |
4 |
=======
17 |
=======
app/models/book.rb |
100.00 % |
13 |
>>>>>>> d0dc1f1 (Featire specs)
=======
app/models/book.rb |
100.00 % |
13 |
>>>>>>> 752f0c0 (Featire specs)
=======
app/models/book.rb |
100.00 % |
13 |
>>>>>>> 4e81ea2 (Featire specs)
=======
app/models/book.rb |
100.00 % |
13 |
>>>>>>> 08edf50 (Featire specs)
=======
app/models/book.rb |
100.00 % |
13 |
>>>>>>> 7a02bbe (Featire specs)
=======
app/models/book.rb |
100.00 % |
13 |
>>>>>>> 4552227 (Featire specs)
9 |
9 |
>>>>>>> 078304c (Rebased)
=======
19 |
10 |
10 |
>>>>>>> 0b5b269 (Fix)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> 4552227 (Featire specs)
app/models/book.rb |
100.00 % |
13 |
9 |
9 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> d6f7da8 (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> f5da5ac (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5f79779 (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 56a05fb (Featire specs)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 6d21330 (Featire specs)
=======
=======
>>>>>>> 4552227 (Featire specs)
>>>>>>> 27e3351 (Featire specs)
=======
19 |
10 |
10 |
>>>>>>> 1ac6be1 (Fix)
=======
>>>>>>> cde4834 (Manifest_cache true)
=======
app/models/book.rb |
100.00 % |
15 |
8 |
8 |
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 56ef3ac (Featire specs)
=======
=======
>>>>>>> 8b420cf (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 113da87 (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 20256f8 (Featire specs)
0 |
1.00 |
| app/models/books_category.rb |
100.00 % |
6 |
4 |
4 |
=======
17 |
9 |
9 |
>>>>>>> bebaea7 (Rebased)
=======
19 |
10 |
10 |
>>>>>>> 1a9aba9 (Fix)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
app/models/book.rb |
100.00 % |
13 |
9 |
9 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> dacfb20 (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 93db8b1 (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5f76842 (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ea0650c (Featire specs)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> a038b16 (Featire specs)
=======
=======
>>>>>>> 4552227 (Featire specs)
>>>>>>> d7fadcd (Featire specs)
=======
>>>>>>> 49e3b70 (Fix)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> 4552227 (Featire specs)
app/models/book.rb |
100.00 % |
13 |
9 |
9 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 78d0719 (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> f861b82 (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 2fd2048 (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> bc0ff2c (Featire specs)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 9bf2aae (Featire specs)
=======
=======
>>>>>>> 4552227 (Featire specs)
>>>>>>> 5ce1a6d (Featire specs)
=======
17 |
9 |
9 |
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
0 |
1.00 |
| app/models/books_category.rb |
100.00 % |
6 |
4 |
4 |
0 |
1.00 |
| app/models/category.rb |
100.00 % |
6 |
4 |
4 |
0 |
1.00 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 22ee41c (Add login registration pages)
>>>>>>> 27ceb6f (Add login registration pages)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3dc272d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 3dc272d (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 22ee41c (Add login registration pages)
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 715fac2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 715fac2 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 22ee41c (Add login registration pages)
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 22ee41c (Add login registration pages)
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> f764a87 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> d96cf3b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> d96cf3b (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 730a8ca (Add login registration pages)
| app/models/user.rb |
=======
=======
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
>>>>>>> 6fa625b (Manifest_cache true)
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> c8cdb08 (Manifest_cache true)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
>>>>>>> 9ec6862 (Add login registration pages)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
>>>>>>> cacbab9 (Add login registration pages)
app/models/review.rb |
<<<<<<< HEAD
>>>>>>> aca90e3 (Rebased)
100.00 % |
16 |
7 |
7 |
=======
<<<<<<< HEAD
=======
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 730a8ca (Add login registration pages)
app/models/user.rb |
=======
=======
>>>>>>> 8c32a77 (Featire specs)
=======
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
>>>>>>> 902b803 (Manifest_cache true)
=======
>>>>>>> 0c9131d (Manifest_cache true)
app/models/review.rb |
>>>>>>> c033601 (Rebased)
100.00 % |
<<<<<<< HEAD
8 |
2 |
2 |
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f764a87 (Fix book_spec decrease quantity and price)
=======
>>>>>>> c033601 (Rebased)
100.00 % |
16 |
=======
=======
=======
>>>>>>> 730a8ca (Add login registration pages)
app/models/user.rb |
=======
=======
>>>>>>> a636fda (Featire specs)
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
>>>>>>> 6fa625b (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c8cdb08 (Manifest_cache true)
=======
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
>>>>>>> 9ec6862 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
>>>>>>> cacbab9 (Add login registration pages)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
=======
>>>>>>> c8cdb08 (Manifest_cache true)
>>>>>>> b763f5b (Manifest_cache true)
=======
>>>>>>> 113da87 (Featire specs)
=======
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
>>>>>>> be2f578 (Manifest_cache true)
=======
>>>>>>> 2471c87 (Add login registration pages)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 8b420cf (Featire specs)
app/models/review.rb |
>>>>>>> c033601 (Rebased)
100.00 % |
16 |
=======
=======
app/models/user.rb |
100.00 % |
8 |
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 1a9aba9 (Fix)
=======
=======
>>>>>>> 9dc109d (Featire specs)
=======
>>>>>>> 866aee4 (Manifest_cache true)
=======
>>>>>>> 4e7b845 (Manifest_cache true)
=======
>>>>>>> 864f339 (Featire specs)
=======
>>>>>>> b5f64c6 (Manifest_cache true)
=======
>>>>>>> a2de409 (Featire specs)
=======
>>>>>>> 8c7bad7 (Manifest_cache true)
=======
>>>>>>> 65f3409 (Featire specs)
=======
>>>>>>> e991554 (Manifest_cache true)
=======
>>>>>>> b8aab1a (Manifest_cache true)
=======
>>>>>>> c1749d5 (Featire specs)
=======
>>>>>>> 3c386ca (Manifest_cache true)
=======
>>>>>>> 1cb2e82 (Featire specs)
=======
>>>>>>> fe7e312 (Manifest_cache true)
=======
>>>>>>> 8577deb (Featire specs)
=======
>>>>>>> 94d9078 (Manifest_cache true)
=======
>>>>>>> 7b112c2 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 69eb97e (Add login registration pages)
=======
>>>>>>> ebe5361 (Featire specs)
=======
>>>>>>> 2956182 (Manifest_cache true)
=======
>>>>>>> a455e8a (Fix book_spec decrease quantity and price)
=======
>>>>>>> 089f8cf (Add login registration pages)
=======
>>>>>>> d3d58e0 (Featire specs)
=======
>>>>>>> 9d9ff14 (Manifest_cache true)
=======
>>>>>>> 59078f6 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0edd9b7 (Add login registration pages)
app/models/coupon.rb |
100.00 % |
3 |
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 2471c87 (Add login registration pages)
2 |
2 |
0 |
1.00 |
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e1f4d17 (Add login registration pages)
app/models/user.rb |
100.00 % |
8 |
2 |
2 |
=======
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> f182ac7 (Add login registration pages)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a624084 (Add login registration pages)
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> b15044a (Manifest_cache true)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6a9fede (Add login registration pages)
=======
| app/models/order.rb |
100.00 % |
6 |
4 |
4 |
=======
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
=======
16 |
7 |
7 |
>>>>>>> 1577aeb (Rebased)
0 |
1.00 |
=======
>>>>>>> 2471c87 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
| app/models/order_book.rb |
100.00 % |
4 |
3 |
3 |
0 |
1.00 |
>>>>>>> 7c4ea7f (Fix)
| app/models/review.rb |
100.00 % |
16 |
=======
=======
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> 2471c87 (Add login registration pages)
app/queries/book_query.rb |
87.50 % |
15 |
8 |
>>>>>>> 7375d4b (Manifest_cache true)
7 |
<<<<<<< HEAD
7 |
0 |
1.00 |
=======
1 |
7.50 |
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
>>>>>>> e1f4d17 (Add login registration pages)
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 26b462d (Add login registration pages)
=======
=======
=======
>>>>>>> 730a8ca (Add login registration pages)
| app/models/user.rb |
=======
=======
>>>>>>> a636fda (Featire specs)
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
>>>>>>> 6fa625b (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> c8cdb08 (Manifest_cache true)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
>>>>>>> 9ec6862 (Add login registration pages)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 24b58e6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57a2e05 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> 00f8b58 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
>>>>>>> cacbab9 (Add login registration pages)
<<<<<<< HEAD
=======
>>>>>>> ed97c39 (Manifest_cache true)
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 65459e8 (Add login registration pages)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 587ce47 (Manifest_cache true)
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
>>>>>>> cb955a0 (Add login registration pages)
app/models/review.rb |
>>>>>>> c033601 (Rebased)
100.00 % |
16 |
=======
=======
=======
=======
>>>>>>> e54ceb0 (Featire specs)
=======
>>>>>>> 1bfc7a6 (Manifest_cache true)
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 58d403b (Add login registration pages)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
>>>>>>> 3b839af (Manifest_cache true)
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
=======
>>>>>>> b575a28 (Add login registration pages)
=======
>>>>>>> 5a0bcc7 (Featire specs)
=======
>>>>>>> 0832698 (Manifest_cache true)
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5caffae (Add login registration pages)
app/models/coupon.rb |
100.00 % |
3 |
>>>>>>> 01d9256 (Add login registration pages)
=======
app/models/coupon.rb |
100.00 % |
3 |
>>>>>>> fb10fe4 (Add login registration pages)
=======
app/models/user.rb |
100.00 % |
8 |
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 1a9aba9 (Fix)
=======
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0005d4a (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 01d9256 (Add login registration pages)
=======
=======
=======
>>>>>>> 69eb97e (Add login registration pages)
=======
app/models/user.rb |
100.00 % |
8 |
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 58d403b (Add login registration pages)
<<<<<<< HEAD
>>>>>>> b26425c (Add login registration pages)
=======
=======
=======
>>>>>>> 089f8cf (Add login registration pages)
=======
app/models/user.rb |
100.00 % |
8 |
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b575a28 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 845289f (Add login registration pages)
=======
=======
=======
>>>>>>> 0edd9b7 (Add login registration pages)
=======
app/models/user.rb |
100.00 % |
8 |
>>>>>>> 26b462d (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 5caffae (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 569a007 (Add login registration pages)
=======
=======
app/models/coupon.rb |
100.00 % |
3 |
>>>>>>> 8f1bc14 (Fix)
<<<<<<< HEAD
>>>>>>> 49e3b70 (Fix)
=======
=======
>>>>>>> fb10fe4 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 591c3b2 (Add login registration pages)
=======
=======
>>>>>>> 69eb97e (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 055b00f (Add login registration pages)
=======
=======
>>>>>>> 089f8cf (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e7ec208 (Add login registration pages)
=======
=======
>>>>>>> 0edd9b7 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 61908af (Add login registration pages)
=======
=======
app/models/coupon.rb |
100.00 % |
3 |
>>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
2 |
2 |
0 |
1.00 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e1f4d17 (Add login registration pages)
app/models/user.rb |
100.00 % |
8 |
2 |
2 |
=======
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> f182ac7 (Add login registration pages)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a624084 (Add login registration pages)
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> b15044a (Manifest_cache true)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6a9fede (Add login registration pages)
=======
=======
=======
>>>>>>> 0005d4a (Add login registration pages)
=======
>>>>>>> 58d403b (Add login registration pages)
=======
>>>>>>> b575a28 (Add login registration pages)
=======
>>>>>>> 5caffae (Add login registration pages)
=======
=======
=======
>>>>>>> 730a8ca (Add login registration pages)
=======
>>>>>>> e1f4d17 (Add login registration pages)
=======
>>>>>>> 26b462d (Add login registration pages)
=======
>>>>>>> 8f1bc14 (Fix)
=======
=======
>>>>>>> fb10fe4 (Add login registration pages)
=======
>>>>>>> 69eb97e (Add login registration pages)
=======
>>>>>>> 089f8cf (Add login registration pages)
=======
>>>>>>> 0edd9b7 (Add login registration pages)
=======
=======
=======
>>>>>>> 730a8ca (Add login registration pages)
=======
>>>>>>> e1f4d17 (Add login registration pages)
=======
>>>>>>> 26b462d (Add login registration pages)
=======
>>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1214e1f (Add login registration pages)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 730a8ca (Add login registration pages)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
>>>>>>> e1f4d17 (Add login registration pages)
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 26b462d (Add login registration pages)
| app/queries/book_query.rb |
87.50 % |
15 |
8 |
7 |
1 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
7.25 |
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b8aab1a (Manifest_cache true)
=======
=======
7.50 |
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
>>>>>>> fb10fe4 (Add login registration pages)
=======
=======
7.25 |
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 7b112c2 (Fix book_spec decrease quantity and price)
=======
=======
7.50 |
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 69eb97e (Add login registration pages)
=======
=======
7.25 |
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a455e8a (Fix book_spec decrease quantity and price)
=======
=======
7.50 |
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 089f8cf (Add login registration pages)
=======
=======
7.25 |
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 59078f6 (Fix book_spec decrease quantity and price)
=======
=======
7.50 |
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 0edd9b7 (Add login registration pages)
=======
app/models/credit_card.rb |
100.00 % |
12 |
6 |
6 |
0 |
1.00 |
| app/models/delivery.rb |
100.00 % |
5 |
3 |
3 |
0 |
1.00 |
>>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1214e1f (Add login registration pages)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 730a8ca (Add login registration pages)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
>>>>>>> e1f4d17 (Add login registration pages)
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 26b462d (Add login registration pages)
| app/queries/book_query.rb |
87.50 % |
15 |
8 |
7 |
1 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
7.25 |
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4e7b845 (Manifest_cache true)
=======
=======
7.50 |
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 0005d4a (Add login registration pages)
=======
=======
7.25 |
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
=======
=======
7.50 |
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 58d403b (Add login registration pages)
=======
=======
7.25 |
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
=======
=======
7.50 |
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> b575a28 (Add login registration pages)
=======
=======
7.25 |
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
=======
=======
7.50 |
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 5caffae (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8f1bc14 (Fix)
=======
>>>>>>> b8aab1a (Manifest_cache true)
=======
>>>>>>> 7b112c2 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a455e8a (Fix book_spec decrease quantity and price)
=======
>>>>>>> 59078f6 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
| app/models/order.rb |
100.00 % |
9 |
6 |
6 |
0 |
1.00 |
| app/models/order_book.rb |
100.00 % |
4 |
3 |
3 |
0 |
1.00 |
>>>>>>> 7c4ea7f (Fix)
| app/models/review.rb |
100.00 % |
16 |
7 |
7 |
0 |
1.00 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
>>>>>>> e1f4d17 (Add login registration pages)
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 26b462d (Add login registration pages)
| app/queries/book_query.rb |
87.50 % |
15 |
8 |
7 |
1 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
7.50 |
>>>>>>> 730a8ca (Add login registration pages)
=======
7.50 |
>>>>>>> e1f4d17 (Add login registration pages)
=======
7.50 |
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 1214e1f (Add login registration pages)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
| app/queries/book_query.rb |
87.50 % |
15 |
8 |
<<<<<<< HEAD
>>>>>>> 7375d4b (Manifest_cache true)
7 |
<<<<<<< HEAD
7 |
>>>>>>> a5d032d (Fix)
0 |
1.00 |
=======
1 |
7.50 |
>>>>>>> 1214e1f (Add login registration pages)
=======
7 |
1 |
7.25 |
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
7.25 |
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
7.25 |
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
>>>>>>> e1f4d17 (Add login registration pages)
| app/queries/book_query.rb |
87.50 % |
15 |
8 |
7 |
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7c4ea7f (Fix)
app/models/shipping.rb |
100.00 % |
2 |
1 |
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
1 |
<<<<<<< HEAD
<<<<<<< HEAD
7.50 |
>>>>>>> 730a8ca (Add login registration pages)
=======
7.50 |
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 1214e1f (Add login registration pages)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
| app/queries/book_query.rb |
87.50 % |
15 |
8 |
<<<<<<< HEAD
>>>>>>> 7375d4b (Manifest_cache true)
7 |
<<<<<<< HEAD
7 |
0 |
1.00 |
<<<<<<< HEAD
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 1a9aba9 (Fix)
=======
=======
>>>>>>> 9dc109d (Featire specs)
=======
>>>>>>> 866aee4 (Manifest_cache true)
=======
>>>>>>> 4e7b845 (Manifest_cache true)
=======
>>>>>>> 864f339 (Featire specs)
=======
>>>>>>> b5f64c6 (Manifest_cache true)
=======
>>>>>>> a2de409 (Featire specs)
=======
>>>>>>> 8c7bad7 (Manifest_cache true)
app/models/coupon.rb |
100.00 % |
3 |
>>>>>>> 7c4ea7f (Fix)
=======
=======
>>>>>>> e54ceb0 (Featire specs)
=======
>>>>>>> 1bfc7a6 (Manifest_cache true)
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 58d403b (Add login registration pages)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
>>>>>>> 3b839af (Manifest_cache true)
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
=======
>>>>>>> b575a28 (Add login registration pages)
=======
>>>>>>> 5a0bcc7 (Featire specs)
=======
>>>>>>> 0832698 (Manifest_cache true)
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5caffae (Add login registration pages)
app/models/coupon.rb |
100.00 % |
3 |
=======
app/models/user.rb |
100.00 % |
8 |
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0005d4a (Add login registration pages)
=======
=======
app/models/user.rb |
100.00 % |
8 |
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 58d403b (Add login registration pages)
=======
=======
app/models/user.rb |
100.00 % |
8 |
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> b575a28 (Add login registration pages)
=======
=======
app/models/user.rb |
100.00 % |
8 |
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 5caffae (Add login registration pages)
=======
app/models/coupon.rb |
100.00 % |
3 |
>>>>>>> 8f1bc14 (Fix)
2 |
2 |
0 |
1.00 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e1f4d17 (Add login registration pages)
app/models/user.rb |
100.00 % |
8 |
2 |
2 |
=======
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> f182ac7 (Add login registration pages)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a624084 (Add login registration pages)
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> b15044a (Manifest_cache true)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6a9fede (Add login registration pages)
=======
=======
=======
>>>>>>> 0005d4a (Add login registration pages)
=======
>>>>>>> 58d403b (Add login registration pages)
=======
>>>>>>> b575a28 (Add login registration pages)
=======
>>>>>>> 5caffae (Add login registration pages)
=======
=======
=======
>>>>>>> 730a8ca (Add login registration pages)
=======
>>>>>>> e1f4d17 (Add login registration pages)
=======
>>>>>>> 26b462d (Add login registration pages)
=======
>>>>>>> 8f1bc14 (Fix)
=======
=======
7 |
1 |
7.25 |
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
7.25 |
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1214e1f (Add login registration pages)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 730a8ca (Add login registration pages)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
>>>>>>> e1f4d17 (Add login registration pages)
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 26b462d (Add login registration pages)
=======
=======
>>>>>>> 27ceb6f (Add login registration pages)
=======
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 0c9131d (Manifest_cache true)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
>>>>>>> 1214e1f (Add login registration pages)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 22ee41c (Add login registration pages)
>>>>>>> 27ceb6f (Add login registration pages)
| app/queries/book_query.rb |
87.50 % |
15 |
8 |
7 |
1 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 22ee41c (Add login registration pages)
>>>>>>> 27ceb6f (Add login registration pages)
7.25 |
<<<<<<< HEAD
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4e7b845 (Manifest_cache true)
=======
=======
7.50 |
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 0005d4a (Add login registration pages)
=======
=======
7.25 |
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
=======
=======
7.50 |
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 58d403b (Add login registration pages)
=======
=======
7.25 |
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
=======
=======
7.50 |
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> b575a28 (Add login registration pages)
=======
=======
7.25 |
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
=======
=======
7.50 |
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 5caffae (Add login registration pages)
=======
<<<<<<< HEAD
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> 4552227 (Featire specs)
app/queries/book_query.rb |
85.71 % |
13 |
7 |
6 |
1 |
8.14 |
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
7.50 |
>>>>>>> 1214e1f (Add login registration pages)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> 3dc272d (Featire specs)
=======
=======
=======
7.25 |
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
=======
=======
=======
7.50 |
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 22ee41c (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 27ceb6f (Add login registration pages)
=======
=======
=======
>>>>>>> 6fa625b (Manifest_cache true)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a5d032d (Fix)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
app/models/shipping.rb |
100.00 % |
2 |
1 |
1 |
0 |
1.00 |
>>>>>>> 1577aeb (Rebased)
<<<<<<< HEAD
=======
>>>>>>> bf554f4 (Rebased)
=======
>>>>>>> a5d032d (Fix)
| app/models/user.rb |
50.00 % |
21 |
12 |
6 |
6 |
0.50 |
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a5d032d (Fix)
| app/queries/book_query.rb |
90.00 % |
17 |
10 |
9 |
1 |
9.30 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c033601 (Rebased)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54deeb (Featire specs)
app/queries/book_query.rb |
85.71 % |
13 |
7 |
6 |
1 |
8.14 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> a5d032d (Fix)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 3b03895 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> e54deeb (Featire specs)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 3b03895 (Featire specs)
=======
=======
>>>>>>> 4552227 (Featire specs)
>>>>>>> 94841b5 (Featire specs)
=======
| app/models/user.rb |
57.14 % |
23 |
14 |
8 |
6 |
0.57 |
| app/queries/book_query.rb |
90.00 % |
17 |
10 |
9 |
1 |
9.30 |
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8f1bc14 (Fix)
| app/models/order.rb |
100.00 % |
6 |
4 |
4 |
0 |
1.00 |
| app/models/order_book.rb |
100.00 % |
4 |
3 |
3 |
0 |
1.00 |
>>>>>>> 7c4ea7f (Fix)
| app/models/review.rb |
100.00 % |
16 |
7 |
7 |
0 |
1.00 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
>>>>>>> e1f4d17 (Add login registration pages)
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 26b462d (Add login registration pages)
| app/queries/book_query.rb |
87.50 % |
15 |
8 |
7 |
1 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
7.50 |
>>>>>>> 730a8ca (Add login registration pages)
=======
7.50 |
>>>>>>> e1f4d17 (Add login registration pages)
=======
7.50 |
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 1214e1f (Add login registration pages)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
| app/queries/book_query.rb |
87.50 % |
15 |
8 |
<<<<<<< HEAD
>>>>>>> 7375d4b (Manifest_cache true)
7 |
<<<<<<< HEAD
7 |
>>>>>>> a5d032d (Fix)
0 |
1.00 |
=======
1 |
7.50 |
>>>>>>> 1214e1f (Add login registration pages)
=======
7 |
1 |
7.25 |
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
7.25 |
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
7.25 |
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
>>>>>>> e1f4d17 (Add login registration pages)
| app/queries/book_query.rb |
87.50 % |
15 |
8 |
7 |
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7c4ea7f (Fix)
app/models/shipping.rb |
100.00 % |
2 |
1 |
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
1 |
<<<<<<< HEAD
<<<<<<< HEAD
7.50 |
>>>>>>> 730a8ca (Add login registration pages)
=======
7.50 |
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 1214e1f (Add login registration pages)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
| app/queries/book_query.rb |
87.50 % |
15 |
8 |
<<<<<<< HEAD
>>>>>>> 7375d4b (Manifest_cache true)
7 |
<<<<<<< HEAD
7 |
0 |
1.00 |
<<<<<<< HEAD
=======
1 |
7.50 |
>>>>>>> 1214e1f (Add login registration pages)
=======
7 |
1 |
7.25 |
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
7.25 |
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1214e1f (Add login registration pages)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 22ee41c (Add login registration pages)
>>>>>>> 03c0867 (Add login registration pages)
| app/queries/book_query.rb |
87.50 % |
15 |
8 |
7 |
1 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
7.50 |
>>>>>>> 730a8ca (Add login registration pages)
=======
7.50 |
>>>>>>> e1f4d17 (Add login registration pages)
=======
7.50 |
>>>>>>> 26b462d (Add login registration pages)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 22ee41c (Add login registration pages)
>>>>>>> 03c0867 (Add login registration pages)
7.25 |
<<<<<<< HEAD
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> 4552227 (Featire specs)
app/queries/book_query.rb |
85.71 % |
13 |
7 |
6 |
1 |
8.14 |
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
7.50 |
>>>>>>> 1214e1f (Add login registration pages)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> 715fac2 (Featire specs)
=======
=======
=======
7.25 |
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
=======
=======
7.50 |
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 22ee41c (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 03c0867 (Add login registration pages)
=======
=======
=======
>>>>>>> 6fa625b (Manifest_cache true)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a5d032d (Fix)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
app/models/shipping.rb |
100.00 % |
2 |
1 |
1 |
0 |
1.00 |
>>>>>>> 836a973 (Rebased)
<<<<<<< HEAD
=======
>>>>>>> bf554f4 (Rebased)
=======
>>>>>>> a5d032d (Fix)
| app/models/user.rb |
50.00 % |
21 |
12 |
6 |
6 |
0.50 |
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a5d032d (Fix)
| app/queries/book_query.rb |
90.00 % |
17 |
10 |
9 |
1 |
9.30 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c033601 (Rebased)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
=======
=======
=======
=======
>>>>>>> aa4fb26 (Add sort orders)
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54deeb (Featire specs)
app/queries/book_query.rb |
85.71 % |
13 |
7 |
6 |
1 |
8.14 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> a5d032d (Fix)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 3b03895 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> e54deeb (Featire specs)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 3b03895 (Featire specs)
=======
=======
>>>>>>> 4552227 (Featire specs)
>>>>>>> 94841b5 (Featire specs)
=======
| app/models/user.rb |
53.85 % |
22 |
13 |
7 |
6 |
0.54 |
| app/queries/book_query.rb |
90.00 % |
17 |
10 |
9 |
1 |
9.30 |
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1214e1f (Add login registration pages)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
| app/queries/book_query.rb |
87.50 % |
15 |
8 |
<<<<<<< HEAD
>>>>>>> 7375d4b (Manifest_cache true)
7 |
<<<<<<< HEAD
7 |
>>>>>>> a5d032d (Fix)
0 |
1.00 |
=======
1 |
7.50 |
>>>>>>> 1214e1f (Add login registration pages)
=======
7 |
1 |
7.25 |
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
7.25 |
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
7.25 |
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
>>>>>>> e1f4d17 (Add login registration pages)
| app/queries/book_query.rb |
87.50 % |
15 |
8 |
7 |
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7c4ea7f (Fix)
app/models/shipping.rb |
100.00 % |
2 |
1 |
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
1 |
<<<<<<< HEAD
<<<<<<< HEAD
7.50 |
>>>>>>> 730a8ca (Add login registration pages)
=======
7.50 |
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 1214e1f (Add login registration pages)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
| app/queries/book_query.rb |
87.50 % |
15 |
8 |
<<<<<<< HEAD
>>>>>>> 7375d4b (Manifest_cache true)
7 |
<<<<<<< HEAD
7 |
0 |
1.00 |
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> e1f4d17 (Add login registration pages)
app/models/user.rb |
100.00 % |
8 |
2 |
2 |
=======
app/models/review.rb |
100.00 % |
16 |
7 |
7 |
>>>>>>> a5d032d (Fix)
=======
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
0 |
1.00 |
=======
1 |
7.50 |
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
>>>>>>> cb74525 (Add login registration pages)
=======
=======
7 |
1 |
7.25 |
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
7.25 |
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
>>>>>>> e1f4d17 (Add login registration pages)
=======
=======
>>>>>>> e50f73e (Add login registration pages)
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 0bdcc5e (Manifest_cache true)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 1214e1f (Add login registration pages)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 22ee41c (Add login registration pages)
>>>>>>> e50f73e (Add login registration pages)
| app/queries/book_query.rb |
87.50 % |
15 |
8 |
7 |
1 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
7.50 |
>>>>>>> 730a8ca (Add login registration pages)
=======
7.50 |
>>>>>>> e1f4d17 (Add login registration pages)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 22ee41c (Add login registration pages)
>>>>>>> e50f73e (Add login registration pages)
7.25 |
<<<<<<< HEAD
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> 4552227 (Featire specs)
app/queries/book_query.rb |
85.71 % |
13 |
7 |
6 |
1 |
8.14 |
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
7.50 |
>>>>>>> 1214e1f (Add login registration pages)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
=======
=======
=======
7.25 |
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
=======
=======
7.50 |
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 22ee41c (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e50f73e (Add login registration pages)
=======
=======
=======
>>>>>>> 6fa625b (Manifest_cache true)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a5d032d (Fix)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
app/models/shipping.rb |
100.00 % |
2 |
1 |
1 |
0 |
1.00 |
>>>>>>> ee78f39 (Rebased)
<<<<<<< HEAD
=======
>>>>>>> bf554f4 (Rebased)
=======
>>>>>>> a5d032d (Fix)
| app/models/user.rb |
50.00 % |
21 |
12 |
6 |
6 |
0.50 |
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a5d032d (Fix)
| app/queries/book_query.rb |
90.00 % |
17 |
10 |
9 |
1 |
9.30 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c033601 (Rebased)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54deeb (Featire specs)
app/queries/book_query.rb |
85.71 % |
13 |
7 |
6 |
1 |
8.14 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> a5d032d (Fix)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 3b03895 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> e54deeb (Featire specs)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 3b03895 (Featire specs)
=======
=======
>>>>>>> 4552227 (Featire specs)
>>>>>>> 94841b5 (Featire specs)
=======
| app/models/user.rb |
53.85 % |
22 |
13 |
7 |
6 |
0.54 |
| app/queries/book_query.rb |
90.00 % |
17 |
10 |
9 |
1 |
9.30 |
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1214e1f (Add login registration pages)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
| app/queries/book_query.rb |
87.50 % |
15 |
8 |
<<<<<<< HEAD
>>>>>>> 7375d4b (Manifest_cache true)
7 |
<<<<<<< HEAD
7 |
>>>>>>> d780a52 (Rebased)
0 |
1.00 |
=======
1 |
7.50 |
>>>>>>> 1214e1f (Add login registration pages)
=======
7 |
1 |
7.25 |
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
7.25 |
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1214e1f (Add login registration pages)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> b6a32ab (Add login registration pages)
=======
>>>>>>> d780a52 (Rebased)
=======
>>>>>>> cfd1f7f (Manifest_cache true)
=======
>>>>>>> c54769d (Fix book_spec decrease quantity and price)
=======
>>>>>>> c346782 (Fix book_spec decrease quantity and price)
>>>>>>> 1214e1f (Add login registration pages)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> f764a87 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 22ee41c (Add login registration pages)
>>>>>>> b6a32ab (Add login registration pages)
| app/queries/book_query.rb |
87.50 % |
15 |
8 |
7 |
1 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> f764a87 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 22ee41c (Add login registration pages)
>>>>>>> b6a32ab (Add login registration pages)
7.25 |
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> d96cf3b (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
app/queries/book_query.rb |
85.71 % |
13 |
7 |
6 |
1 |
8.14 |
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
7.50 |
>>>>>>> 1214e1f (Add login registration pages)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
7.25 |
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 6fa625b (Manifest_cache true)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a5d032d (Fix)
app/models/shipping.rb |
100.00 % |
2 |
1 |
1 |
0 |
1.00 |
=======
>>>>>>> 5c33a07 (Featire specs)
=======
=======
7.25 |
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> f764a87 (Fix book_spec decrease quantity and price)
=======
=======
=======
7.50 |
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 22ee41c (Add login registration pages)
<<<<<<< HEAD
>>>>>>> b6a32ab (Add login registration pages)
=======
=======
app/models/shipping.rb |
100.00 % |
2 |
1 |
1 |
0 |
1.00 |
>>>>>>> d780a52 (Rebased)
<<<<<<< HEAD
=======
>>>>>>> bf554f4 (Rebased)
=======
>>>>>>> a5d032d (Fix)
| app/models/user.rb |
50.00 % |
21 |
12 |
6 |
6 |
0.50 |
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a5d032d (Fix)
| app/queries/book_query.rb |
90.00 % |
17 |
10 |
9 |
1 |
9.30 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> aca90e3 (Rebased)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> d96cf3b (Featire specs)
=======
>>>>>>> c033601 (Rebased)
>>>>>>> d780a52 (Rebased)
=======
=======
>>>>>>> b28889f (Fix)
>>>>>>> c033601 (Rebased)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> 7a02bbe (Featire specs)
app/queries/book_query.rb |
85.71 % |
13 |
7 |
6 |
1 |
8.14 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 83979de (Featire specs)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 12bcf81 (Featire specs)
=======
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3e35e (Featire specs)
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 1677b1a (Featire specs)
=======
=======
>>>>>>> a5d032d (Fix)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> e9f3851 (Manifest_cache true)
=======
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> d15fe1d (Fix)
=======
<<<<<<< HEAD
>>>>>>> dcf74e1 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> bcd09ab (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> eaef86a (Fix)
=======
>>>>>>> 5518ff0 (Manifest_cache true)
=======
>>>>>>> a1fe6da (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 2ee03d3 (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
=======
>>>>>>> d780a52 (Rebased)
=======
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 7945032 (Manifest_cache true)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> b832d45 (Featire specs)
>>>>>>> a9bf83f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 715fac2 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 9bebee5 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 3e9f99d (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> b832d45 (Featire specs)
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 3dc272d (Featire specs)
=======
>>>>>>> 902b803 (Manifest_cache true)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
=======
>>>>>>> b832d45 (Featire specs)
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3dc272d (Featire specs)
=======
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
=======
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> b00b319 (Manifest_cache true)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> d782a28 (Manifest_cache true)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> 394c6f3 (Manifest_cache true)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 022e63e (Manifest_cache true)
=======
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 3dc272d (Featire specs)
=======
>>>>>>> b763f5b (Manifest_cache true)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 027f794 (Manifest_cache true)
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 35d17b9 (Manifest_cache true)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 10bdfea (Manifest_cache true)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> e2bfd89 (Manifest_cache true)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> d96cf3b (Featire specs)
=======
=======
=======
>>>>>>> 183b6c5 (Manifest_cache true)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 64d4167 (Featire specs)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> f764a87 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> d780a52 (Rebased)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b9cc4e9 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d0f5c14 (Manifest_cache true)
=======
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
=======
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6fa625b (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> cfd1f7f (Manifest_cache true)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
=======
=======
>>>>>>> c8cdb08 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e031bce (Manifest_cache true)
=======
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 12bcf81 (Featire specs)
=======
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 02ba384 (Manifest_cache true)
=======
=======
>>>>>>> 904663c (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fd3e35e (Featire specs)
=======
=======
>>>>>>> b459807 (Manifest_cache true)
=======
=======
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 24b58e6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 926dfe5 (Manifest_cache true)
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c54769d (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 1677b1a (Featire specs)
=======
=======
=======
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 00f8b58 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1830ff1 (Manifest_cache true)
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c346782 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d52ad35 (Rebased)
=======
=======
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
=======
=======
>>>>>>> 0b43b18 (Manifest_cache true)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
=======
=======
=======
>>>>>>> 183b6c5 (Manifest_cache true)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ee78f39 (Rebased)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b9cc4e9 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 7945032 (Manifest_cache true)
=======
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
=======
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6fa625b (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0bdcc5e (Manifest_cache true)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 563720e (Featire specs)
=======
=======
>>>>>>> c8cdb08 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b00b319 (Manifest_cache true)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
>>>>>>> 86d584a (Manifest_cache true)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> b459807 (Manifest_cache true)
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
=======
=======
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 00f8b58 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
>>>>>>> 49e8a6c (Rebased)
=======
=======
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> dcf74e1 (Manifest_cache true)
=======
=======
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
=======
=======
>>>>>>> bcd09ab (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
=======
=======
>>>>>>> c006a44 (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 35d17b9 (Manifest_cache true)
=======
=======
>>>>>>> 848bfa2 (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> d70f030 (Manifest_cache true)
=======
=======
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> add330c (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> cae047f (Manifest_cache true)
=======
=======
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 15bff2e (Manifest_cache true)
=======
=======
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
=======
>>>>>>> 998f08d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 6c71f00 (Manifest_cache true)
=======
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0b5b269 (Fix)
=======
>>>>>>> 1a9aba9 (Fix)
=======
=======
| app/queries/order_query.rb |
36.36 % |
19 |
11 |
4 |
7 |
0.36 |
>>>>>>> 25f3c50 (Add sort orders)
| app/services/book_service.rb |
88.89 % |
19 |
9 |
8 |
1 |
1.56 |
| app/services/checkout_service.rb |
50.00 % |
7 |
4 |
2 |
2 |
0.50 |
| app/services/coupon_service.rb |
81.82 % |
17 |
11 |
9 |
2 |
1.91 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1d59aaa (Fix)
=======
=======
>>>>>>> be2f578 (Manifest_cache true)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> 715fac2 (Featire specs)
=======
=======
=======
>>>>>>> 183b6c5 (Manifest_cache true)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> 836a973 (Rebased)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b9cc4e9 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 9bebee5 (Manifest_cache true)
=======
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
=======
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6fa625b (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> ee5935f (Manifest_cache true)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 3e9f99d (Featire specs)
=======
=======
>>>>>>> c8cdb08 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 394c6f3 (Manifest_cache true)
=======
=======
>>>>>>> 113da87 (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5be567f (Featire specs)
=======
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0b43b18 (Manifest_cache true)
=======
=======
>>>>>>> 8b420cf (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 2ee03d3 (Featire specs)
=======
=======
>>>>>>> ed97c39 (Manifest_cache true)
=======
=======
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 24b58e6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> caaaa41 (Manifest_cache true)
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5506bd0 (Featire specs)
=======
=======
=======
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 00f8b58 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8874887 (Manifest_cache true)
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
>>>>>>> 078304c (Rebased)
=======
=======
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> d15fe1d (Fix)
=======
>>>>>>> dcf74e1 (Manifest_cache true)
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> d66884b (Manifest_cache true)
=======
>>>>>>> bcd09ab (Featire specs)
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
>>>>>>> 022e63e (Manifest_cache true)
=======
>>>>>>> c006a44 (Featire specs)
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
>>>>>>> 10bdfea (Manifest_cache true)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> d70f030 (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> cae047f (Manifest_cache true)
=======
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> fefbd35 (Featire specs)
=======
=======
=======
>>>>>>> 998f08d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a9e654b (Manifest_cache true)
=======
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0b5b269 (Fix)
=======
=======
=======
>>>>>>> 864f339 (Featire specs)
=======
>>>>>>> a2de409 (Featire specs)
=======
>>>>>>> e54ceb0 (Featire specs)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
>>>>>>> 5a0bcc7 (Featire specs)
=======
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 866aee4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> ab67c96 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4e7b845 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4e0a8d9 (Manifest_cache true)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
>>>>>>> f5da5ac (Featire specs)
=======
=======
=======
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b5f64c6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 036bb32 (Manifest_cache true)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5f79779 (Featire specs)
=======
=======
=======
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8c7bad7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 3e8974a (Manifest_cache true)
=======
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 56a05fb (Featire specs)
=======
=======
=======
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1bfc7a6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 23e9df9 (Manifest_cache true)
=======
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> da83d1a (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6d21330 (Featire specs)
=======
=======
=======
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 3b839af (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 9617beb (Manifest_cache true)
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2a431e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 27e3351 (Featire specs)
=======
=======
=======
>>>>>>> 998f08d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0832698 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b40a04e (Manifest_cache true)
=======
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> e733663 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 8f1bc14 (Fix)
>>>>>>> 1ac6be1 (Fix)
| config/application.rb |
100.00 % |
22 |
7 |
7 |
=======
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> 3dc272d (Featire specs)
=======
=======
=======
>>>>>>> 183b6c5 (Manifest_cache true)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c033601 (Rebased)
>>>>>>> 1577aeb (Rebased)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b9cc4e9 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 902b803 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 6fa625b (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0c9131d (Manifest_cache true)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 56ef3ac (Featire specs)
=======
=======
>>>>>>> c8cdb08 (Manifest_cache true)
>>>>>>> b763f5b (Manifest_cache true)
=======
>>>>>>> 113da87 (Featire specs)
=======
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
>>>>>>> be2f578 (Manifest_cache true)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> ed97c39 (Manifest_cache true)
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 20256f8 (Featire specs)
=======
=======
=======
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 00f8b58 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 587ce47 (Manifest_cache true)
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> bf554f4 (Rebased)
>>>>>>> bebaea7 (Rebased)
=======
=======
>>>>>>> a5d032d (Fix)
>>>>>>> eaef86a (Fix)
=======
=======
=======
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 5518ff0 (Manifest_cache true)
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 75be480 (Manifest_cache true)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> a1fe6da (Featire specs)
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 027f794 (Manifest_cache true)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 28fed3c (Featire specs)
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e2bfd89 (Manifest_cache true)
=======
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ed6aebd (Featire specs)
=======
=======
=======
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d1bae53 (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> 64d4167 (Featire specs)
=======
=======
=======
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 35d9b13 (Manifest_cache true)
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 13fd74f (Featire specs)
=======
=======
=======
>>>>>>> 998f08d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7f7abc (Manifest_cache true)
=======
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1a9aba9 (Fix)
=======
=======
>>>>>>> 93db8b1 (Featire specs)
=======
>>>>>>> 5f76842 (Featire specs)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> d7fadcd (Featire specs)
=======
>>>>>>> 49e3b70 (Fix)
=======
>>>>>>> 6edce20 (Manifest_cache true)
=======
>>>>>>> f861b82 (Featire specs)
=======
>>>>>>> 2fd2048 (Featire specs)
=======
>>>>>>> bc0ff2c (Featire specs)
=======
>>>>>>> 9bf2aae (Featire specs)
=======
>>>>>>> 5ce1a6d (Featire specs)
>>>>>>> 7c4ea7f (Fix)
=======
=======
>>>>>>> 864f339 (Featire specs)
=======
>>>>>>> a2de409 (Featire specs)
=======
>>>>>>> e54ceb0 (Featire specs)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
>>>>>>> 5a0bcc7 (Featire specs)
=======
>>>>>>> c1749d5 (Featire specs)
=======
>>>>>>> 1cb2e82 (Featire specs)
=======
>>>>>>> 8577deb (Featire specs)
=======
>>>>>>> ebe5361 (Featire specs)
=======
>>>>>>> d3d58e0 (Featire specs)
=======
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 866aee4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 459d812 (Manifest_cache true)
=======
=======
=======
>>>>>>> b8aab1a (Manifest_cache true)
=======
=======
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4e7b845 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 3fef583 (Manifest_cache true)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
>>>>>>> 93db8b1 (Featire specs)
=======
=======
=======
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b5f64c6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b746b60 (Manifest_cache true)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5f76842 (Featire specs)
=======
=======
=======
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8c7bad7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e965665 (Manifest_cache true)
=======
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
>>>>>>> ea0650c (Featire specs)
=======
=======
=======
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1bfc7a6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 10b6c72 (Manifest_cache true)
=======
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
>>>>>>> a038b16 (Featire specs)
=======
=======
=======
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 3b839af (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a77cc8a (Manifest_cache true)
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
>>>>>>> d7fadcd (Featire specs)
=======
=======
=======
>>>>>>> 998f08d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0832698 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 39467b5 (Manifest_cache true)
=======
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
config/application.rb |
100.00 % |
22 |
6 |
6 |
>>>>>>> cde4834 (Manifest_cache true)
=======
=======
>>>>>>> 8f1bc14 (Fix)
=======
=======
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> e991554 (Manifest_cache true)
=======
>>>>>>> b8aab1a (Manifest_cache true)
=======
>>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
config/application.rb |
100.00 % |
22 |
7 |
7 |
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 49e3b70 (Fix)
=======
=======
6 |
6 |
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 78d0719 (Featire specs)
=======
=======
=======
>>>>>>> bd8bda4 (Manifest_cache true)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> aa7b40c (Manifest_cache true)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> 183b6c5 (Manifest_cache true)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> fd6db03 (Manifest_cache true)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4552227 (Featire specs)
=======
>>>>>>> 998f08d (Manifest_cache true)
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
config/application.rb |
100.00 % |
22 |
6 |
6 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> f861b82 (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 2fd2048 (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> bc0ff2c (Featire specs)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 9bf2aae (Featire specs)
=======
=======
>>>>>>> 4552227 (Featire specs)
>>>>>>> 5ce1a6d (Featire specs)
=======
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
0 |
1.00 |
| config/boot.rb |
100.00 % |
4 |
3 |
3 |
0 |
1.00 |
| config/environment.rb |
100.00 % |
5 |
2 |
2 |
0 |
1.00 |
| config/environments/test.rb |
100.00 % |
60 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> bebaea7 (Rebased)
=======
>>>>>>> b35d1f8 (Featire specs)
=======
>>>>>>> a1fe6da (Featire specs)
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> 1a9aba9 (Fix)
=======
>>>>>>> dacfb20 (Featire specs)
=======
>>>>>>> 93db8b1 (Featire specs)
=======
>>>>>>> 5f76842 (Featire specs)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> d7fadcd (Featire specs)
=======
>>>>>>> 49e3b70 (Fix)
=======
>>>>>>> 78d0719 (Featire specs)
=======
>>>>>>> f861b82 (Featire specs)
=======
>>>>>>> 2fd2048 (Featire specs)
=======
>>>>>>> bc0ff2c (Featire specs)
=======
>>>>>>> 9bf2aae (Featire specs)
=======
>>>>>>> 5ce1a6d (Featire specs)
=======
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
19 |
19 |
0 |
1.00 |
| config/initializers/active_admin.rb |
100.00 % |
12 |
11 |
11 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
18 |
18 |
>>>>>>> cde4834 (Manifest_cache true)
=======
>>>>>>> 1577aeb (Rebased)
=======
=======
>>>>>>> b35d1f8 (Featire specs)
=======
>>>>>>> dacfb20 (Featire specs)
=======
>>>>>>> 78d0719 (Featire specs)
=======
18 |
18 |
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8c32a77 (Featire specs)
=======
=======
>>>>>>> a1fe6da (Featire specs)
=======
>>>>>>> 93db8b1 (Featire specs)
=======
>>>>>>> f861b82 (Featire specs)
=======
18 |
18 |
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 56ef3ac (Featire specs)
=======
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> 5f76842 (Featire specs)
=======
>>>>>>> 2fd2048 (Featire specs)
=======
18 |
18 |
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 113da87 (Featire specs)
=======
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> bc0ff2c (Featire specs)
=======
18 |
18 |
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8b420cf (Featire specs)
=======
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> 9bf2aae (Featire specs)
=======
18 |
18 |
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> bebaea7 (Rebased)
=======
>>>>>>> b35d1f8 (Featire specs)
=======
>>>>>>> a1fe6da (Featire specs)
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> 64d4167 (Featire specs)
=======
=======
>>>>>>> d7fadcd (Featire specs)
=======
>>>>>>> 5ce1a6d (Featire specs)
=======
18 |
18 |
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> 1a9aba9 (Fix)
=======
>>>>>>> dacfb20 (Featire specs)
=======
>>>>>>> 93db8b1 (Featire specs)
=======
>>>>>>> 5f76842 (Featire specs)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> d7fadcd (Featire specs)
=======
>>>>>>> 49e3b70 (Fix)
=======
>>>>>>> 78d0719 (Featire specs)
=======
>>>>>>> f861b82 (Featire specs)
=======
>>>>>>> 2fd2048 (Featire specs)
=======
>>>>>>> bc0ff2c (Featire specs)
=======
>>>>>>> 9bf2aae (Featire specs)
=======
>>>>>>> 5ce1a6d (Featire specs)
=======
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
0 |
1.00 |
| config/initializers/application_controller_renderer.rb |
100.00 % |
8 |
0 |
0 |
0 |
0.00 |
| config/initializers/assets.rb |
100.00 % |
14 |
2 |
2 |
0 |
1.00 |
| config/initializers/backtrace_silencers.rb |
100.00 % |
8 |
1 |
1 |
0 |
1.00 |
| config/initializers/content_security_policy.rb |
100.00 % |
30 |
0 |
0 |
0 |
0.00 |
| config/initializers/cookies_serializer.rb |
100.00 % |
5 |
1 |
1 |
0 |
1.00 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> aca90e3 (Rebased)
| config/initializers/devise.rb |
100.00 % |
20 |
14 |
14 |
=======
=======
>>>>>>> b6a32ab (Add login registration pages)
=======
>>>>>>> d780a52 (Rebased)
=======
>>>>>>> 83979de (Featire specs)
=======
>>>>>>> b3f2049 (Featire specs)
=======
>>>>>>> 12bcf81 (Featire specs)
=======
>>>>>>> 264ef06 (Add login registration pages)
=======
>>>>>>> fd3e35e (Featire specs)
=======
>>>>>>> a1a8477 (Add login registration pages)
=======
>>>>>>> 1677b1a (Featire specs)
=======
>>>>>>> 551615f (Add login registration pages)
=======
>>>>>>> d52ad35 (Rebased)
=======
>>>>>>> e50f73e (Add login registration pages)
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> cb74525 (Add login registration pages)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 8be9029 (Add login registration pages)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 7d58507 (Add login registration pages)
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 852864e (Add login registration pages)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 551f3c1 (Add login registration pages)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> ccec311 (Add login registration pages)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> 8c3e531 (Add login registration pages)
=======
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> 03c0867 (Add login registration pages)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 039806b (Add login registration pages)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 45f9f35 (Add login registration pages)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> 697ad44 (Add login registration pages)
=======
>>>>>>> 078304c (Rebased)
=======
>>>>>>> b4763a2 (Featire specs)
=======
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 0fc3bf0 (Add login registration pages)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> af9487a (Add login registration pages)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> 140c987 (Add login registration pages)
=======
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> 0c3a150 (Add login registration pages)
=======
>>>>>>> 0b5b269 (Fix)
=======
>>>>>>> d6f7da8 (Featire specs)
=======
>>>>>>> f5da5ac (Featire specs)
=======
>>>>>>> 5f79779 (Featire specs)
=======
>>>>>>> 282f108 (Add login registration pages)
=======
>>>>>>> 56a05fb (Featire specs)
=======
>>>>>>> db0e854 (Add login registration pages)
=======
>>>>>>> 6d21330 (Featire specs)
=======
>>>>>>> 2cdd6f4 (Add login registration pages)
=======
>>>>>>> 27e3351 (Featire specs)
=======
>>>>>>> 3a43955 (Add login registration pages)
=======
>>>>>>> 1ac6be1 (Fix)
=======
>>>>>>> 27ceb6f (Add login registration pages)
=======
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 2471c87 (Add login registration pages)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 65459e8 (Add login registration pages)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> cb955a0 (Add login registration pages)
=======
>>>>>>> bebaea7 (Rebased)
=======
>>>>>>> b35d1f8 (Featire specs)
=======
>>>>>>> a1fe6da (Featire specs)
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> aeec696 (Add login registration pages)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> b5affcb (Add login registration pages)
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> 4f7c979 (Add login registration pages)
=======
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> 60943cc (Add login registration pages)
=======
>>>>>>> 1a9aba9 (Fix)
=======
>>>>>>> dacfb20 (Featire specs)
=======
>>>>>>> 93db8b1 (Featire specs)
=======
>>>>>>> 5f76842 (Featire specs)
=======
>>>>>>> 01d9256 (Add login registration pages)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> b26425c (Add login registration pages)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> 845289f (Add login registration pages)
=======
>>>>>>> d7fadcd (Featire specs)
=======
>>>>>>> 569a007 (Add login registration pages)
=======
>>>>>>> 49e3b70 (Fix)
=======
>>>>>>> 78d0719 (Featire specs)
=======
>>>>>>> f861b82 (Featire specs)
=======
>>>>>>> 2fd2048 (Featire specs)
=======
>>>>>>> 591c3b2 (Add login registration pages)
=======
>>>>>>> bc0ff2c (Featire specs)
=======
>>>>>>> 055b00f (Add login registration pages)
=======
>>>>>>> 9bf2aae (Featire specs)
=======
>>>>>>> e7ec208 (Add login registration pages)
=======
>>>>>>> 5ce1a6d (Featire specs)
=======
>>>>>>> 61908af (Add login registration pages)
=======
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 22ee41c (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c033601 (Rebased)
=======
>>>>>>> a636fda (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 9ec6862 (Add login registration pages)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> cacbab9 (Add login registration pages)
=======
>>>>>>> bf554f4 (Rebased)
config/initializers/devise.rb |
100.00 % |
<<<<<<< HEAD
311 |
13 |
13 |
>>>>>>> d96cf3b (Featire specs)
=======
20 |
14 |
14 |
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d780a52 (Rebased)
=======
=======
=======
>>>>>>> 730a8ca (Add login registration pages)
=======
>>>>>>> e1f4d17 (Add login registration pages)
=======
=======
<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> e50f73e (Add login registration pages)
=======
=======
<<<<<<< HEAD
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> 03c0867 (Add login registration pages)
=======
=======
<<<<<<< HEAD
>>>>>>> 3dc272d (Featire specs)
=======
>>>>>>> 27ceb6f (Add login registration pages)
config/initializers/devise.rb |
100.00 % |
311 |
13 |
13 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 264ef06 (Add login registration pages)
=======
=======
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
>>>>>>> a1a8477 (Add login registration pages)
=======
=======
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 551615f (Add login registration pages)
=======
>>>>>>> d52ad35 (Rebased)
=======
>>>>>>> df37394 (Featire specs)
=======
=======
>>>>>>> c033601 (Rebased)
=======
>>>>>>> a636fda (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 9ec6862 (Add login registration pages)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> cacbab9 (Add login registration pages)
=======
>>>>>>> bf554f4 (Rebased)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> f182ac7 (Add login registration pages)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> a624084 (Add login registration pages)
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> 6a9fede (Add login registration pages)
=======
>>>>>>> 7c4ea7f (Fix)
=======
>>>>>>> 9dc109d (Featire specs)
=======
>>>>>>> 864f339 (Featire specs)
=======
>>>>>>> a2de409 (Featire specs)
=======
>>>>>>> 0005d4a (Add login registration pages)
=======
>>>>>>> e54ceb0 (Featire specs)
=======
>>>>>>> 58d403b (Add login registration pages)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
>>>>>>> b575a28 (Add login registration pages)
=======
>>>>>>> 5a0bcc7 (Featire specs)
=======
>>>>>>> 5caffae (Add login registration pages)
=======
>>>>>>> 8f1bc14 (Fix)
=======
>>>>>>> 65f3409 (Featire specs)
=======
>>>>>>> c1749d5 (Featire specs)
=======
>>>>>>> 1cb2e82 (Featire specs)
=======
>>>>>>> fb10fe4 (Add login registration pages)
=======
>>>>>>> 8577deb (Featire specs)
=======
>>>>>>> 69eb97e (Add login registration pages)
=======
>>>>>>> ebe5361 (Featire specs)
=======
>>>>>>> 089f8cf (Add login registration pages)
=======
>>>>>>> d3d58e0 (Featire specs)
=======
>>>>>>> 0edd9b7 (Add login registration pages)
=======
>>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
config/initializers/devise.rb |
100.00 % |
20 |
<<<<<<< HEAD
14 |
14 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ee78f39 (Rebased)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 730a8ca (Add login registration pages)
=======
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 852864e (Add login registration pages)
=======
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 551f3c1 (Add login registration pages)
=======
>>>>>>> ccec311 (Add login registration pages)
=======
=======
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 8c3e531 (Add login registration pages)
=======
=======
>>>>>>> 282f108 (Add login registration pages)
=======
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> db0e854 (Add login registration pages)
=======
>>>>>>> 2cdd6f4 (Add login registration pages)
=======
=======
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 3a43955 (Add login registration pages)
=======
=======
>>>>>>> 591c3b2 (Add login registration pages)
=======
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 055b00f (Add login registration pages)
=======
>>>>>>> e7ec208 (Add login registration pages)
=======
=======
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 61908af (Add login registration pages)
config/initializers/devise.rb |
100.00 % |
311 |
13 |
13 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
>>>>>>> cb74525 (Add login registration pages)
=======
=======
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 8be9029 (Add login registration pages)
=======
=======
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 7d58507 (Add login registration pages)
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> 852864e (Add login registration pages)
=======
>>>>>>> 1214e1f (Add login registration pages)
=======
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 551f3c1 (Add login registration pages)
=======
=======
>>>>>>> 8c3e531 (Add login registration pages)
=======
>>>>>>> 3a43955 (Add login registration pages)
=======
>>>>>>> 61908af (Add login registration pages)
>>>>>>> 1214e1f (Add login registration pages)
=======
>>>>>>> 730a8ca (Add login registration pages)
=======
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ccec311 (Add login registration pages)
=======
=======
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 8c3e531 (Add login registration pages)
=======
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> 715fac2 (Featire specs)
=======
=======
>>>>>>> c033601 (Rebased)
=======
>>>>>>> a636fda (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 9ec6862 (Add login registration pages)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> cacbab9 (Add login registration pages)
=======
>>>>>>> bf554f4 (Rebased)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> f182ac7 (Add login registration pages)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> a624084 (Add login registration pages)
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> 6a9fede (Add login registration pages)
=======
>>>>>>> 7c4ea7f (Fix)
=======
>>>>>>> 9dc109d (Featire specs)
=======
>>>>>>> 864f339 (Featire specs)
=======
>>>>>>> a2de409 (Featire specs)
=======
>>>>>>> 0005d4a (Add login registration pages)
=======
>>>>>>> e54ceb0 (Featire specs)
=======
>>>>>>> 58d403b (Add login registration pages)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
>>>>>>> b575a28 (Add login registration pages)
=======
>>>>>>> 5a0bcc7 (Featire specs)
=======
>>>>>>> 5caffae (Add login registration pages)
=======
>>>>>>> 8f1bc14 (Fix)
config/initializers/devise.rb |
100.00 % |
20 |
14 |
14 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 836a973 (Rebased)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 730a8ca (Add login registration pages)
=======
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 0fc3bf0 (Add login registration pages)
=======
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> af9487a (Add login registration pages)
=======
>>>>>>> 140c987 (Add login registration pages)
=======
=======
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 0c3a150 (Add login registration pages)
=======
=======
>>>>>>> 01d9256 (Add login registration pages)
=======
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> b26425c (Add login registration pages)
=======
>>>>>>> 845289f (Add login registration pages)
=======
=======
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 569a007 (Add login registration pages)
config/initializers/devise.rb |
100.00 % |
311 |
13 |
13 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 039806b (Add login registration pages)
=======
=======
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 45f9f35 (Add login registration pages)
=======
=======
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 697ad44 (Add login registration pages)
=======
>>>>>>> 078304c (Rebased)
=======
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> 0fc3bf0 (Add login registration pages)
=======
>>>>>>> 1214e1f (Add login registration pages)
=======
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> af9487a (Add login registration pages)
=======
=======
>>>>>>> 0c3a150 (Add login registration pages)
=======
>>>>>>> 569a007 (Add login registration pages)
>>>>>>> 1214e1f (Add login registration pages)
=======
>>>>>>> 730a8ca (Add login registration pages)
=======
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 140c987 (Add login registration pages)
=======
=======
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 0c3a150 (Add login registration pages)
=======
>>>>>>> 0b5b269 (Fix)
=======
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> 282f108 (Add login registration pages)
=======
>>>>>>> 1214e1f (Add login registration pages)
=======
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> db0e854 (Add login registration pages)
=======
>>>>>>> 1214e1f (Add login registration pages)
=======
>>>>>>> 730a8ca (Add login registration pages)
=======
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 2cdd6f4 (Add login registration pages)
=======
=======
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 3a43955 (Add login registration pages)
=======
>>>>>>> 1ac6be1 (Fix)
=======
>>>>>>> 3dc272d (Featire specs)
=======
=======
>>>>>>> c033601 (Rebased)
=======
>>>>>>> a636fda (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 9ec6862 (Add login registration pages)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> cacbab9 (Add login registration pages)
=======
>>>>>>> bf554f4 (Rebased)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> f182ac7 (Add login registration pages)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> a624084 (Add login registration pages)
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> 6a9fede (Add login registration pages)
=======
>>>>>>> 7c4ea7f (Fix)
config/initializers/devise.rb |
100.00 % |
20 |
14 |
14 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1577aeb (Rebased)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> 730a8ca (Add login registration pages)
=======
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> aeec696 (Add login registration pages)
=======
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> b5affcb (Add login registration pages)
=======
>>>>>>> 4f7c979 (Add login registration pages)
=======
=======
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 60943cc (Add login registration pages)
config/initializers/devise.rb |
100.00 % |
311 |
13 |
13 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 2471c87 (Add login registration pages)
=======
=======
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 65459e8 (Add login registration pages)
=======
=======
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> cb955a0 (Add login registration pages)
=======
>>>>>>> bebaea7 (Rebased)
=======
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> aeec696 (Add login registration pages)
=======
>>>>>>> 1214e1f (Add login registration pages)
=======
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> b5affcb (Add login registration pages)
=======
=======
>>>>>>> 60943cc (Add login registration pages)
>>>>>>> 1214e1f (Add login registration pages)
=======
>>>>>>> 730a8ca (Add login registration pages)
=======
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 4f7c979 (Add login registration pages)
=======
=======
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 60943cc (Add login registration pages)
=======
>>>>>>> 1a9aba9 (Fix)
=======
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> 01d9256 (Add login registration pages)
=======
>>>>>>> 1214e1f (Add login registration pages)
=======
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> b26425c (Add login registration pages)
=======
>>>>>>> 1214e1f (Add login registration pages)
=======
>>>>>>> 730a8ca (Add login registration pages)
=======
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 845289f (Add login registration pages)
=======
=======
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 569a007 (Add login registration pages)
=======
>>>>>>> 49e3b70 (Fix)
=======
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> 591c3b2 (Add login registration pages)
=======
>>>>>>> 1214e1f (Add login registration pages)
=======
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 055b00f (Add login registration pages)
=======
>>>>>>> 1214e1f (Add login registration pages)
=======
>>>>>>> 730a8ca (Add login registration pages)
=======
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> e7ec208 (Add login registration pages)
=======
=======
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 61908af (Add login registration pages)
=======
13 |
13 |
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
0 |
1.00 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> aca90e3 (Rebased)
=======
=======
>>>>>>> b6a32ab (Add login registration pages)
=======
>>>>>>> d780a52 (Rebased)
=======
>>>>>>> 83979de (Featire specs)
=======
>>>>>>> 264ef06 (Add login registration pages)
=======
>>>>>>> a1a8477 (Add login registration pages)
=======
>>>>>>> 551615f (Add login registration pages)
=======
>>>>>>> d52ad35 (Rebased)
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> cb74525 (Add login registration pages)
=======
>>>>>>> 8be9029 (Add login registration pages)
=======
>>>>>>> 7d58507 (Add login registration pages)
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> 852864e (Add login registration pages)
=======
>>>>>>> 551f3c1 (Add login registration pages)
=======
>>>>>>> ccec311 (Add login registration pages)
=======
>>>>>>> 8c3e531 (Add login registration pages)
=======
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 039806b (Add login registration pages)
=======
>>>>>>> 45f9f35 (Add login registration pages)
=======
>>>>>>> 697ad44 (Add login registration pages)
=======
>>>>>>> 078304c (Rebased)
=======
>>>>>>> b4763a2 (Featire specs)
=======
>>>>>>> 0fc3bf0 (Add login registration pages)
=======
>>>>>>> af9487a (Add login registration pages)
=======
>>>>>>> 140c987 (Add login registration pages)
=======
>>>>>>> 0c3a150 (Add login registration pages)
=======
>>>>>>> 0b5b269 (Fix)
=======
>>>>>>> d6f7da8 (Featire specs)
=======
>>>>>>> 282f108 (Add login registration pages)
=======
>>>>>>> db0e854 (Add login registration pages)
=======
>>>>>>> 2cdd6f4 (Add login registration pages)
=======
>>>>>>> 3a43955 (Add login registration pages)
=======
>>>>>>> 1ac6be1 (Fix)
=======
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 2471c87 (Add login registration pages)
=======
>>>>>>> 65459e8 (Add login registration pages)
=======
>>>>>>> cb955a0 (Add login registration pages)
=======
>>>>>>> bebaea7 (Rebased)
=======
>>>>>>> b35d1f8 (Featire specs)
=======
>>>>>>> aeec696 (Add login registration pages)
=======
>>>>>>> b5affcb (Add login registration pages)
=======
>>>>>>> 4f7c979 (Add login registration pages)
=======
>>>>>>> 60943cc (Add login registration pages)
=======
>>>>>>> 1a9aba9 (Fix)
=======
>>>>>>> dacfb20 (Featire specs)
=======
>>>>>>> 01d9256 (Add login registration pages)
=======
>>>>>>> b26425c (Add login registration pages)
=======
>>>>>>> 845289f (Add login registration pages)
=======
>>>>>>> 569a007 (Add login registration pages)
=======
>>>>>>> 49e3b70 (Fix)
=======
>>>>>>> 78d0719 (Featire specs)
=======
>>>>>>> 591c3b2 (Add login registration pages)
=======
>>>>>>> 055b00f (Add login registration pages)
=======
>>>>>>> e7ec208 (Add login registration pages)
=======
>>>>>>> 61908af (Add login registration pages)
=======
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> d96cf3b (Featire specs)
=======
=======
=======
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 22ee41c (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b6a32ab (Add login registration pages)
=======
=======
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d780a52 (Rebased)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> cb74525 (Add login registration pages)
=======
>>>>>>> 039806b (Add login registration pages)
=======
>>>>>>> 2471c87 (Add login registration pages)
>>>>>>> 9ec6862 (Add login registration pages)
=======
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a1fe6da (Featire specs)
=======
>>>>>>> 93db8b1 (Featire specs)
=======
>>>>>>> f861b82 (Featire specs)
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 83979de (Featire specs)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 12bcf81 (Featire specs)
=======
=======
=======
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 9ec6862 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 264ef06 (Add login registration pages)
=======
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fd3e35e (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> cacbab9 (Add login registration pages)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
=======
>>>>>>> 8be9029 (Add login registration pages)
=======
>>>>>>> cacbab9 (Add login registration pages)
=======
>>>>>>> 7d58507 (Add login registration pages)
=======
>>>>>>> f182ac7 (Add login registration pages)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 852864e (Add login registration pages)
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 551f3c1 (Add login registration pages)
=======
>>>>>>> a624084 (Add login registration pages)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ccec311 (Add login registration pages)
=======
>>>>>>> 6a9fede (Add login registration pages)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8c3e531 (Add login registration pages)
=======
=======
=======
>>>>>>> 45f9f35 (Add login registration pages)
=======
>>>>>>> cacbab9 (Add login registration pages)
=======
>>>>>>> 697ad44 (Add login registration pages)
=======
>>>>>>> f182ac7 (Add login registration pages)
=======
>>>>>>> 0fc3bf0 (Add login registration pages)
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
>>>>>>> af9487a (Add login registration pages)
=======
>>>>>>> a624084 (Add login registration pages)
=======
>>>>>>> 140c987 (Add login registration pages)
=======
>>>>>>> 6a9fede (Add login registration pages)
=======
>>>>>>> 0c3a150 (Add login registration pages)
=======
>>>>>>> 0005d4a (Add login registration pages)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 282f108 (Add login registration pages)
=======
>>>>>>> 58d403b (Add login registration pages)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> db0e854 (Add login registration pages)
=======
>>>>>>> b575a28 (Add login registration pages)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 2cdd6f4 (Add login registration pages)
=======
>>>>>>> 5caffae (Add login registration pages)
=======
<<<<<<< HEAD
>>>>>>> 3a43955 (Add login registration pages)
=======
=======
=======
>>>>>>> 65459e8 (Add login registration pages)
=======
>>>>>>> cacbab9 (Add login registration pages)
=======
>>>>>>> cb955a0 (Add login registration pages)
=======
>>>>>>> f182ac7 (Add login registration pages)
=======
>>>>>>> aeec696 (Add login registration pages)
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
>>>>>>> b5affcb (Add login registration pages)
=======
>>>>>>> a624084 (Add login registration pages)
=======
>>>>>>> 4f7c979 (Add login registration pages)
=======
>>>>>>> 6a9fede (Add login registration pages)
=======
>>>>>>> 60943cc (Add login registration pages)
=======
>>>>>>> 0005d4a (Add login registration pages)
=======
>>>>>>> 01d9256 (Add login registration pages)
=======
>>>>>>> 58d403b (Add login registration pages)
=======
>>>>>>> b26425c (Add login registration pages)
=======
>>>>>>> b575a28 (Add login registration pages)
=======
>>>>>>> 845289f (Add login registration pages)
=======
>>>>>>> 5caffae (Add login registration pages)
=======
>>>>>>> 569a007 (Add login registration pages)
=======
>>>>>>> fb10fe4 (Add login registration pages)
=======
<<<<<<< HEAD
>>>>>>> 591c3b2 (Add login registration pages)
=======
>>>>>>> 69eb97e (Add login registration pages)
=======
<<<<<<< HEAD
>>>>>>> 055b00f (Add login registration pages)
=======
>>>>>>> 089f8cf (Add login registration pages)
=======
<<<<<<< HEAD
>>>>>>> e7ec208 (Add login registration pages)
=======
>>>>>>> 0edd9b7 (Add login registration pages)
=======
>>>>>>> 61908af (Add login registration pages)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 45f9f35 (Add login registration pages)
=======
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 0fc3bf0 (Add login registration pages)
=======
>>>>>>> 5f79779 (Featire specs)
=======
>>>>>>> 282f108 (Add login registration pages)
=======
>>>>>>> 65459e8 (Add login registration pages)
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> aeec696 (Add login registration pages)
=======
>>>>>>> 5f76842 (Featire specs)
=======
>>>>>>> 01d9256 (Add login registration pages)
=======
>>>>>>> 2fd2048 (Featire specs)
=======
>>>>>>> 591c3b2 (Add login registration pages)
=======
>>>>>>> 1214e1f (Add login registration pages)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> af9487a (Add login registration pages)
=======
>>>>>>> 56a05fb (Featire specs)
=======
>>>>>>> db0e854 (Add login registration pages)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> b5affcb (Add login registration pages)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> b26425c (Add login registration pages)
=======
>>>>>>> bc0ff2c (Featire specs)
=======
>>>>>>> 055b00f (Add login registration pages)
=======
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> 6d21330 (Featire specs)
=======
>>>>>>> 9bf2aae (Featire specs)
>>>>>>> 57a2e05 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> a1a8477 (Add login registration pages)
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 1677b1a (Featire specs)
=======
=======
=======
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> cacbab9 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 551615f (Add login registration pages)
=======
=======
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
>>>>>>> d52ad35 (Rebased)
=======
=======
>>>>>>> e50f73e (Add login registration pages)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
=======
=======
=======
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 22ee41c (Add login registration pages)
>>>>>>> e50f73e (Add login registration pages)
=======
=======
>>>>>>> c033601 (Rebased)
>>>>>>> ee78f39 (Rebased)
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 563720e (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9bf83f (Featire specs)
=======
=======
=======
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 9ec6862 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> cb74525 (Add login registration pages)
=======
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 57a2e05 (Add login registration pages)
>>>>>>> 8be9029 (Add login registration pages)
=======
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> a038b16 (Featire specs)
>>>>>>> 57a2e05 (Add login registration pages)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4f7c979 (Add login registration pages)
=======
>>>>>>> 845289f (Add login registration pages)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
=======
=======
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 13fd74f (Featire specs)
>>>>>>> cacbab9 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 7d58507 (Add login registration pages)
=======
=======
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
>>>>>>> 49e8a6c (Rebased)
=======
=======
>>>>>>> b4763a2 (Featire specs)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
=======
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> a1fe6da (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> 0fc3bf0 (Add login registration pages)
=======
>>>>>>> aeec696 (Add login registration pages)
=======
=======
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> f182ac7 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 852864e (Add login registration pages)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> af9487a (Add login registration pages)
=======
>>>>>>> b5affcb (Add login registration pages)
=======
=======
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 57da3ff (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 551f3c1 (Add login registration pages)
=======
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> 64d4167 (Featire specs)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> 140c987 (Add login registration pages)
=======
>>>>>>> 4f7c979 (Add login registration pages)
=======
=======
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> a624084 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ccec311 (Add login registration pages)
=======
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
=======
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 6a9fede (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8c3e531 (Add login registration pages)
=======
=======
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
>>>>>>> 1d59aaa (Fix)
=======
=======
>>>>>>> 03c0867 (Add login registration pages)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> 715fac2 (Featire specs)
=======
=======
=======
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 22ee41c (Add login registration pages)
>>>>>>> 03c0867 (Add login registration pages)
=======
=======
>>>>>>> c033601 (Rebased)
>>>>>>> 836a973 (Rebased)
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 2a25e4c (Featire specs)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 3e9f99d (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5be567f (Featire specs)
=======
=======
=======
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 9ec6862 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 039806b (Add login registration pages)
=======
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 3723aad (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
=======
=======
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 57a2e05 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 45f9f35 (Add login registration pages)
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> cb955a0 (Add login registration pages)
=======
=======
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> cacbab9 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 697ad44 (Add login registration pages)
=======
=======
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
>>>>>>> 078304c (Rebased)
=======
>>>>>>> b4763a2 (Featire specs)
=======
>>>>>>> bcd09ab (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 0fc3bf0 (Add login registration pages)
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> af9487a (Add login registration pages)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> 140c987 (Add login registration pages)
=======
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> fefbd35 (Featire specs)
=======
=======
=======
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 6a9fede (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 0c3a150 (Add login registration pages)
=======
=======
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
>>>>>>> 0b5b269 (Fix)
=======
=======
>>>>>>> dacfb20 (Featire specs)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9dc109d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d6f7da8 (Featire specs)
=======
=======
>>>>>>> 93db8b1 (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f5da5ac (Featire specs)
=======
=======
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5f79779 (Featire specs)
=======
=======
>>>>>>> 01d9256 (Add login registration pages)
=======
=======
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> 0005d4a (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 282f108 (Add login registration pages)
=======
=======
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 56a05fb (Featire specs)
=======
=======
>>>>>>> b26425c (Add login registration pages)
=======
=======
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 58d403b (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> db0e854 (Add login registration pages)
=======
=======
>>>>>>> a038b16 (Featire specs)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6d21330 (Featire specs)
=======
=======
>>>>>>> 845289f (Add login registration pages)
=======
=======
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> b575a28 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 2cdd6f4 (Add login registration pages)
=======
=======
>>>>>>> d7fadcd (Featire specs)
=======
=======
>>>>>>> 4552227 (Featire specs)
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 27e3351 (Featire specs)
=======
=======
>>>>>>> 569a007 (Add login registration pages)
=======
=======
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 5caffae (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3a43955 (Add login registration pages)
=======
=======
>>>>>>> 8f1bc14 (Fix)
<<<<<<< HEAD
>>>>>>> 1ac6be1 (Fix)
=======
>>>>>>> cde4834 (Manifest_cache true)
=======
=======
>>>>>>> 27ceb6f (Add login registration pages)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> 3dc272d (Featire specs)
=======
=======
=======
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 22ee41c (Add login registration pages)
>>>>>>> 27ceb6f (Add login registration pages)
=======
=======
>>>>>>> c033601 (Rebased)
>>>>>>> 1577aeb (Rebased)
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 8c32a77 (Featire specs)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 56ef3ac (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 113da87 (Featire specs)
=======
=======
=======
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 9ec6862 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 2471c87 (Add login registration pages)
=======
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 3723aad (Featire specs)
>>>>>>> 8b420cf (Featire specs)
=======
=======
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 57a2e05 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 65459e8 (Add login registration pages)
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> cb955a0 (Add login registration pages)
=======
=======
>>>>>>> bf554f4 (Rebased)
>>>>>>> bebaea7 (Rebased)
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
>>>>>>> b35d1f8 (Featire specs)
=======
>>>>>>> a1fe6da (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> aeec696 (Add login registration pages)
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> b5affcb (Add login registration pages)
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> 4f7c979 (Add login registration pages)
=======
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 13fd74f (Featire specs)
=======
=======
=======
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 6a9fede (Add login registration pages)
>>>>>>> 60943cc (Add login registration pages)
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1a9aba9 (Fix)
=======
>>>>>>> dacfb20 (Featire specs)
=======
>>>>>>> 93db8b1 (Featire specs)
=======
=======
>>>>>>> a2de409 (Featire specs)
>>>>>>> 5f76842 (Featire specs)
=======
>>>>>>> 01d9256 (Add login registration pages)
=======
=======
>>>>>>> e54ceb0 (Featire specs)
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> b26425c (Add login registration pages)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> 845289f (Add login registration pages)
=======
>>>>>>> d7fadcd (Featire specs)
=======
>>>>>>> 569a007 (Add login registration pages)
=======
=======
>>>>>>> 8f1bc14 (Fix)
>>>>>>> 49e3b70 (Fix)
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 65f3409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 78d0719 (Featire specs)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> c1749d5 (Featire specs)
<<<<<<< HEAD
>>>>>>> f861b82 (Featire specs)
=======
=======
>>>>>>> 1cb2e82 (Featire specs)
<<<<<<< HEAD
>>>>>>> 2fd2048 (Featire specs)
=======
=======
=======
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> fb10fe4 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 591c3b2 (Add login registration pages)
=======
=======
>>>>>>> 8577deb (Featire specs)
<<<<<<< HEAD
>>>>>>> bc0ff2c (Featire specs)
=======
=======
=======
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 69eb97e (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 055b00f (Add login registration pages)
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> ebe5361 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9bf2aae (Featire specs)
=======
=======
=======
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 089f8cf (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e7ec208 (Add login registration pages)
=======
=======
=======
>>>>>>> 4552227 (Featire specs)
>>>>>>> d3d58e0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5ce1a6d (Featire specs)
=======
=======
=======
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 0edd9b7 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 61908af (Add login registration pages)
=======
=======
>>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
| config/initializers/filter_parameter_logging.rb |
100.00 % |
6 |
1 |
1 |
0 |
1.00 |
| config/initializers/inflections.rb |
100.00 % |
16 |
0 |
0 |
0 |
0.00 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> bebaea7 (Rebased)
=======
>>>>>>> b35d1f8 (Featire specs)
=======
>>>>>>> a1fe6da (Featire specs)
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> 1a9aba9 (Fix)
=======
>>>>>>> dacfb20 (Featire specs)
=======
>>>>>>> 93db8b1 (Featire specs)
=======
>>>>>>> 5f76842 (Featire specs)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> d7fadcd (Featire specs)
=======
>>>>>>> 49e3b70 (Fix)
=======
>>>>>>> 78d0719 (Featire specs)
=======
>>>>>>> f861b82 (Featire specs)
=======
>>>>>>> 2fd2048 (Featire specs)
=======
>>>>>>> bc0ff2c (Featire specs)
=======
>>>>>>> 9bf2aae (Featire specs)
=======
>>>>>>> 5ce1a6d (Featire specs)
=======
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
| config/initializers/kaminari.rb |
100.00 % |
3 |
2 |
2 |
0 |
1.00 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> cde4834 (Manifest_cache true)
=======
>>>>>>> 1577aeb (Rebased)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8c32a77 (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 56ef3ac (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 113da87 (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8b420cf (Featire specs)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> bebaea7 (Rebased)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> b35d1f8 (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> a1fe6da (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 28fed3c (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> ed6aebd (Featire specs)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 64d4167 (Featire specs)
=======
=======
>>>>>>> 4552227 (Featire specs)
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> 1a9aba9 (Fix)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> dacfb20 (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 93db8b1 (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 5f76842 (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> ea0650c (Featire specs)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> a038b16 (Featire specs)
=======
=======
>>>>>>> 4552227 (Featire specs)
>>>>>>> d7fadcd (Featire specs)
=======
>>>>>>> 49e3b70 (Fix)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 78d0719 (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> f861b82 (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 2fd2048 (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> bc0ff2c (Featire specs)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9bf2aae (Featire specs)
=======
=======
>>>>>>> 4552227 (Featire specs)
>>>>>>> 5ce1a6d (Featire specs)
=======
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
| config/initializers/mime_types.rb |
100.00 % |
4 |
0 |
0 |
0 |
0.00 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
| config/initializers/omniauth.rb |
=======
config/initializers/money.rb |
>>>>>>> aca90e3 (Rebased)
100.00 % |
3 |
3 |
3 |
=======
=======
>>>>>>> e50f73e (Add login registration pages)
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> cb74525 (Add login registration pages)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 8be9029 (Add login registration pages)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 7d58507 (Add login registration pages)
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 852864e (Add login registration pages)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 551f3c1 (Add login registration pages)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> ccec311 (Add login registration pages)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> 8c3e531 (Add login registration pages)
=======
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> 03c0867 (Add login registration pages)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 45f9f35 (Add login registration pages)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> 697ad44 (Add login registration pages)
=======
>>>>>>> 078304c (Rebased)
=======
>>>>>>> b4763a2 (Featire specs)
=======
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 0fc3bf0 (Add login registration pages)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> af9487a (Add login registration pages)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> 140c987 (Add login registration pages)
=======
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> 0c3a150 (Add login registration pages)
=======
>>>>>>> 0b5b269 (Fix)
=======
>>>>>>> d6f7da8 (Featire specs)
=======
>>>>>>> f5da5ac (Featire specs)
=======
>>>>>>> 5f79779 (Featire specs)
=======
>>>>>>> 282f108 (Add login registration pages)
=======
>>>>>>> 56a05fb (Featire specs)
=======
>>>>>>> db0e854 (Add login registration pages)
=======
>>>>>>> 6d21330 (Featire specs)
=======
>>>>>>> 2cdd6f4 (Add login registration pages)
=======
>>>>>>> 27e3351 (Featire specs)
=======
>>>>>>> 3a43955 (Add login registration pages)
=======
>>>>>>> 1ac6be1 (Fix)
=======
>>>>>>> 27ceb6f (Add login registration pages)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 65459e8 (Add login registration pages)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> cb955a0 (Add login registration pages)
=======
>>>>>>> bebaea7 (Rebased)
=======
>>>>>>> b35d1f8 (Featire specs)
=======
>>>>>>> a1fe6da (Featire specs)
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> aeec696 (Add login registration pages)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> b5affcb (Add login registration pages)
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> 4f7c979 (Add login registration pages)
=======
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> 60943cc (Add login registration pages)
=======
>>>>>>> 1a9aba9 (Fix)
=======
>>>>>>> dacfb20 (Featire specs)
=======
>>>>>>> 93db8b1 (Featire specs)
=======
>>>>>>> 5f76842 (Featire specs)
=======
>>>>>>> 01d9256 (Add login registration pages)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> b26425c (Add login registration pages)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> 845289f (Add login registration pages)
=======
>>>>>>> d7fadcd (Featire specs)
=======
>>>>>>> 569a007 (Add login registration pages)
=======
>>>>>>> 49e3b70 (Fix)
=======
>>>>>>> 78d0719 (Featire specs)
=======
>>>>>>> f861b82 (Featire specs)
=======
>>>>>>> 2fd2048 (Featire specs)
=======
>>>>>>> 591c3b2 (Add login registration pages)
=======
>>>>>>> bc0ff2c (Featire specs)
=======
>>>>>>> 055b00f (Add login registration pages)
=======
>>>>>>> 9bf2aae (Featire specs)
=======
>>>>>>> e7ec208 (Add login registration pages)
=======
>>>>>>> 5ce1a6d (Featire specs)
=======
>>>>>>> 61908af (Add login registration pages)
=======
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 22ee41c (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
config/initializers/omniauth.rb |
=======
=======
>>>>>>> a636fda (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 9ec6862 (Add login registration pages)
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> cacbab9 (Add login registration pages)
=======
>>>>>>> bf554f4 (Rebased)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f182ac7 (Add login registration pages)
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a624084 (Add login registration pages)
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6a9fede (Add login registration pages)
=======
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
=======
>>>>>>> 57a2e05 (Add login registration pages)
>>>>>>> 45f9f35 (Add login registration pages)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
=======
>>>>>>> cacbab9 (Add login registration pages)
>>>>>>> 697ad44 (Add login registration pages)
=======
>>>>>>> c006a44 (Featire specs)
=======
=======
>>>>>>> f182ac7 (Add login registration pages)
>>>>>>> 0fc3bf0 (Add login registration pages)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
>>>>>>> af9487a (Add login registration pages)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
=======
>>>>>>> a624084 (Add login registration pages)
>>>>>>> 140c987 (Add login registration pages)
=======
>>>>>>> fefbd35 (Featire specs)
=======
=======
>>>>>>> 6a9fede (Add login registration pages)
>>>>>>> 0c3a150 (Add login registration pages)
=======
>>>>>>> 0b5b269 (Fix)
=======
=======
>>>>>>> 9dc109d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d6f7da8 (Featire specs)
=======
=======
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f5da5ac (Featire specs)
=======
=======
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5f79779 (Featire specs)
=======
=======
>>>>>>> 0005d4a (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 282f108 (Add login registration pages)
=======
=======
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 56a05fb (Featire specs)
=======
=======
>>>>>>> 58d403b (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> db0e854 (Add login registration pages)
=======
=======
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6d21330 (Featire specs)
=======
=======
>>>>>>> b575a28 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 2cdd6f4 (Add login registration pages)
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 27e3351 (Featire specs)
=======
=======
>>>>>>> 5caffae (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3a43955 (Add login registration pages)
=======
=======
>>>>>>> 8f1bc14 (Fix)
<<<<<<< HEAD
>>>>>>> 1ac6be1 (Fix)
=======
>>>>>>> 8b420cf (Featire specs)
=======
=======
>>>>>>> 57a2e05 (Add login registration pages)
>>>>>>> 65459e8 (Add login registration pages)
=======
>>>>>>> 20256f8 (Featire specs)
=======
=======
>>>>>>> cacbab9 (Add login registration pages)
>>>>>>> cb955a0 (Add login registration pages)
=======
>>>>>>> 28fed3c (Featire specs)
=======
=======
>>>>>>> f182ac7 (Add login registration pages)
>>>>>>> aeec696 (Add login registration pages)
=======
>>>>>>> ed6aebd (Featire specs)
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
>>>>>>> b5affcb (Add login registration pages)
=======
>>>>>>> 64d4167 (Featire specs)
=======
=======
>>>>>>> a624084 (Add login registration pages)
>>>>>>> 4f7c979 (Add login registration pages)
=======
>>>>>>> 13fd74f (Featire specs)
=======
=======
>>>>>>> 6a9fede (Add login registration pages)
>>>>>>> 60943cc (Add login registration pages)
=======
>>>>>>> 1a9aba9 (Fix)
=======
=======
>>>>>>> 9dc109d (Featire specs)
>>>>>>> dacfb20 (Featire specs)
=======
=======
>>>>>>> 864f339 (Featire specs)
>>>>>>> 93db8b1 (Featire specs)
=======
=======
>>>>>>> a2de409 (Featire specs)
>>>>>>> 5f76842 (Featire specs)
=======
=======
>>>>>>> 0005d4a (Add login registration pages)
>>>>>>> 01d9256 (Add login registration pages)
=======
=======
>>>>>>> e54ceb0 (Featire specs)
>>>>>>> ea0650c (Featire specs)
=======
=======
>>>>>>> 58d403b (Add login registration pages)
>>>>>>> b26425c (Add login registration pages)
=======
=======
>>>>>>> 95ebdc2 (Featire specs)
>>>>>>> a038b16 (Featire specs)
=======
=======
>>>>>>> b575a28 (Add login registration pages)
>>>>>>> 845289f (Add login registration pages)
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
>>>>>>> d7fadcd (Featire specs)
=======
=======
>>>>>>> 5caffae (Add login registration pages)
>>>>>>> 569a007 (Add login registration pages)
=======
=======
>>>>>>> 8f1bc14 (Fix)
>>>>>>> 49e3b70 (Fix)
=======
=======
>>>>>>> 65f3409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 78d0719 (Featire specs)
=======
=======
>>>>>>> c1749d5 (Featire specs)
<<<<<<< HEAD
>>>>>>> f861b82 (Featire specs)
=======
=======
>>>>>>> 1cb2e82 (Featire specs)
<<<<<<< HEAD
>>>>>>> 2fd2048 (Featire specs)
=======
=======
>>>>>>> fb10fe4 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 591c3b2 (Add login registration pages)
=======
=======
>>>>>>> 8577deb (Featire specs)
<<<<<<< HEAD
>>>>>>> bc0ff2c (Featire specs)
=======
=======
>>>>>>> 69eb97e (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 055b00f (Add login registration pages)
=======
=======
>>>>>>> ebe5361 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9bf2aae (Featire specs)
=======
=======
>>>>>>> 089f8cf (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e7ec208 (Add login registration pages)
=======
=======
>>>>>>> d3d58e0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5ce1a6d (Featire specs)
=======
=======
>>>>>>> 0edd9b7 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 61908af (Add login registration pages)
=======
=======
>>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
config/initializers/money.rb |
>>>>>>> c033601 (Rebased)
100.00 % |
3 |
<<<<<<< HEAD
2 |
2 |
>>>>>>> df37394 (Featire specs)
=======
<<<<<<< HEAD
3 |
3 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ee78f39 (Rebased)
=======
=======
=======
>>>>>>> e1f4d17 (Add login registration pages)
=======
<<<<<<< HEAD
=======
>>>>>>> 551f3c1 (Add login registration pages)
=======
=======
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> ccec311 (Add login registration pages)
=======
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 8c3e531 (Add login registration pages)
=======
=======
<<<<<<< HEAD
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> 03c0867 (Add login registration pages)
=======
=======
<<<<<<< HEAD
>>>>>>> 3dc272d (Featire specs)
=======
>>>>>>> 27ceb6f (Add login registration pages)
config/initializers/omniauth.rb |
100.00 % |
3 |
2 |
2 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 8be9029 (Add login registration pages)
=======
=======
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 7d58507 (Add login registration pages)
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 551f3c1 (Add login registration pages)
=======
>>>>>>> 730a8ca (Add login registration pages)
=======
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> ccec311 (Add login registration pages)
=======
>>>>>>> 730a8ca (Add login registration pages)
=======
>>>>>>> e1f4d17 (Add login registration pages)
=======
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 8c3e531 (Add login registration pages)
=======
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> 3dc272d (Featire specs)
0 |
1.00 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
| config/initializers/omniauth.rb |
100.00 % |
8 |
3 |
3 |
0 |
1.00 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 8be9029 (Add login registration pages)
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> cb74525 (Add login registration pages)
<<<<<<< HEAD
| config/initializers/omniauth.rb |
100.00 % |
8 |
3 |
3 |
=======
=======
>>>>>>> b6a32ab (Add login registration pages)
=======
>>>>>>> d780a52 (Rebased)
=======
>>>>>>> 83979de (Featire specs)
=======
>>>>>>> b3f2049 (Featire specs)
=======
>>>>>>> 12bcf81 (Featire specs)
=======
>>>>>>> 264ef06 (Add login registration pages)
=======
>>>>>>> fd3e35e (Featire specs)
=======
>>>>>>> a1a8477 (Add login registration pages)
=======
>>>>>>> 1677b1a (Featire specs)
=======
>>>>>>> 551615f (Add login registration pages)
=======
>>>>>>> d52ad35 (Rebased)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 039806b (Add login registration pages)
=======
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 2471c87 (Add login registration pages)
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 22ee41c (Add login registration pages)
config/initializers/omniauth.rb |
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a636fda (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 9ec6862 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> cacbab9 (Add login registration pages)
=======
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
=======
>>>>>>> b832d45 (Featire specs)
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 039806b (Add login registration pages)
=======
>>>>>>> 078304c (Rebased)
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b4763a2 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
>>>>>>> bcd09ab (Featire specs)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
=======
>>>>>>> b832d45 (Featire specs)
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 2471c87 (Add login registration pages)
=======
>>>>>>> bebaea7 (Rebased)
=======
=======
>>>>>>> 9620751 (Featire specs)
>>>>>>> b35d1f8 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
>>>>>>> a1fe6da (Featire specs)
config/initializers/money.rb |
>>>>>>> c033601 (Rebased)
100.00 % |
3 |
<<<<<<< HEAD
2 |
2 |
>>>>>>> d96cf3b (Featire specs)
=======
3 |
3 |
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d780a52 (Rebased)
=======
=======
=======
>>>>>>> e1f4d17 (Add login registration pages)
config/initializers/omniauth.rb |
100.00 % |
3 |
2 |
2 |
<<<<<<< HEAD
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
>>>>>>> a1a8477 (Add login registration pages)
=======
=======
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 551615f (Add login registration pages)
=======
>>>>>>> d52ad35 (Rebased)
0 |
1.00 |
| config/initializers/omniauth.rb |
100.00 % |
8 |
=======
config/initializers/money.rb |
>>>>>>> c033601 (Rebased)
100.00 % |
3 |
>>>>>>> 836a973 (Rebased)
3 |
3 |
0 |
1.00 |
| config/initializers/omniauth.rb |
100.00 % |
8 |
=======
config/initializers/money.rb |
>>>>>>> c033601 (Rebased)
100.00 % |
3 |
>>>>>>> 1577aeb (Rebased)
3 |
3 |
0 |
1.00 |
| config/initializers/omniauth.rb |
100.00 % |
8 |
3 |
3 |
0 |
1.00 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> aca90e3 (Rebased)
=======
=======
>>>>>>> b6a32ab (Add login registration pages)
=======
>>>>>>> 83979de (Featire specs)
=======
>>>>>>> 264ef06 (Add login registration pages)
=======
>>>>>>> d52ad35 (Rebased)
=======
>>>>>>> 0b5b269 (Fix)
=======
>>>>>>> d6f7da8 (Featire specs)
=======
>>>>>>> 282f108 (Add login registration pages)
=======
>>>>>>> 1ac6be1 (Fix)
=======
>>>>>>> 49e3b70 (Fix)
=======
>>>>>>> 78d0719 (Featire specs)
=======
>>>>>>> 591c3b2 (Add login registration pages)
=======
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> d96cf3b (Featire specs)
=======
=======
=======
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 22ee41c (Add login registration pages)
<<<<<<< HEAD
>>>>>>> b6a32ab (Add login registration pages)
=======
=======
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> d780a52 (Rebased)
=======
=======
<<<<<<< HEAD
=======
=======
>>>>>>> cb74525 (Add login registration pages)
>>>>>>> 9ec6862 (Add login registration pages)
=======
>>>>>>> f182ac7 (Add login registration pages)
=======
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 83979de (Featire specs)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 12bcf81 (Featire specs)
=======
=======
=======
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9ec6862 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 264ef06 (Add login registration pages)
=======
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fd3e35e (Featire specs)
=======
=======
>>>>>>> 8be9029 (Add login registration pages)
=======
=======
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 57a2e05 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a1a8477 (Add login registration pages)
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 1677b1a (Featire specs)
=======
=======
=======
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> cacbab9 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 551615f (Add login registration pages)
=======
=======
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
>>>>>>> d52ad35 (Rebased)
=======
=======
>>>>>>> e50f73e (Add login registration pages)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 039806b (Add login registration pages)
=======
>>>>>>> 078304c (Rebased)
=======
>>>>>>> b4763a2 (Featire specs)
=======
>>>>>>> 0fc3bf0 (Add login registration pages)
=======
>>>>>>> 1a9aba9 (Fix)
=======
>>>>>>> dacfb20 (Featire specs)
=======
>>>>>>> 01d9256 (Add login registration pages)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
=======
=======
=======
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 22ee41c (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e50f73e (Add login registration pages)
=======
=======
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ee78f39 (Rebased)
=======
=======
=======
>>>>>>> 9ec6862 (Add login registration pages)
=======
>>>>>>> f182ac7 (Add login registration pages)
=======
>>>>>>> 0005d4a (Add login registration pages)
=======
>>>>>>> fb10fe4 (Add login registration pages)
=======
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 563720e (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9bf83f (Featire specs)
=======
=======
=======
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9ec6862 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> cb74525 (Add login registration pages)
=======
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 8be9029 (Add login registration pages)
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
=======
=======
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> cacbab9 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 7d58507 (Add login registration pages)
=======
=======
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
>>>>>>> 49e8a6c (Rebased)
=======
=======
>>>>>>> b4763a2 (Featire specs)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
=======
>>>>>>> bcd09ab (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> c006a44 (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> 0fc3bf0 (Add login registration pages)
=======
=======
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> f182ac7 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 852864e (Add login registration pages)
=======
=======
>>>>>>> 848bfa2 (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> af9487a (Add login registration pages)
=======
=======
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 57da3ff (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 551f3c1 (Add login registration pages)
=======
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> 140c987 (Add login registration pages)
=======
=======
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> a624084 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ccec311 (Add login registration pages)
=======
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
=======
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 6a9fede (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8c3e531 (Add login registration pages)
=======
=======
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
>>>>>>> 1d59aaa (Fix)
=======
=======
>>>>>>> 03c0867 (Add login registration pages)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 2471c87 (Add login registration pages)
=======
>>>>>>> bebaea7 (Rebased)
=======
>>>>>>> b35d1f8 (Featire specs)
=======
>>>>>>> aeec696 (Add login registration pages)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> 715fac2 (Featire specs)
=======
=======
=======
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 22ee41c (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 03c0867 (Add login registration pages)
=======
=======
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> 836a973 (Rebased)
=======
=======
=======
>>>>>>> 9ec6862 (Add login registration pages)
=======
>>>>>>> f182ac7 (Add login registration pages)
=======
>>>>>>> 0005d4a (Add login registration pages)
=======
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 2a25e4c (Featire specs)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 3e9f99d (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5be567f (Featire specs)
=======
=======
=======
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9ec6862 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 039806b (Add login registration pages)
=======
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 2ee03d3 (Featire specs)
=======
=======
>>>>>>> 65459e8 (Add login registration pages)
=======
=======
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 57a2e05 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 45f9f35 (Add login registration pages)
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5506bd0 (Featire specs)
=======
=======
=======
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> cacbab9 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 697ad44 (Add login registration pages)
=======
=======
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
>>>>>>> 078304c (Rebased)
=======
>>>>>>> b4763a2 (Featire specs)
=======
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 0fc3bf0 (Add login registration pages)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> af9487a (Add login registration pages)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> 140c987 (Add login registration pages)
=======
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> fefbd35 (Featire specs)
=======
=======
=======
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 6a9fede (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 0c3a150 (Add login registration pages)
=======
=======
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
>>>>>>> 0b5b269 (Fix)
=======
=======
>>>>>>> dacfb20 (Featire specs)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9dc109d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d6f7da8 (Featire specs)
=======
=======
>>>>>>> 93db8b1 (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f5da5ac (Featire specs)
=======
=======
>>>>>>> 5f76842 (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5f79779 (Featire specs)
=======
=======
>>>>>>> 01d9256 (Add login registration pages)
=======
=======
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> 0005d4a (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 282f108 (Add login registration pages)
=======
=======
>>>>>>> ea0650c (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 56a05fb (Featire specs)
=======
=======
>>>>>>> b26425c (Add login registration pages)
=======
=======
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 58d403b (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> db0e854 (Add login registration pages)
=======
=======
>>>>>>> a038b16 (Featire specs)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6d21330 (Featire specs)
=======
=======
>>>>>>> 845289f (Add login registration pages)
=======
=======
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> b575a28 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 2cdd6f4 (Add login registration pages)
=======
=======
>>>>>>> d7fadcd (Featire specs)
=======
=======
>>>>>>> 4552227 (Featire specs)
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 27e3351 (Featire specs)
=======
=======
>>>>>>> 569a007 (Add login registration pages)
=======
=======
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 5caffae (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3a43955 (Add login registration pages)
=======
=======
>>>>>>> 8f1bc14 (Fix)
<<<<<<< HEAD
>>>>>>> 1ac6be1 (Fix)
=======
>>>>>>> cde4834 (Manifest_cache true)
=======
=======
>>>>>>> 27ceb6f (Add login registration pages)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> 3dc272d (Featire specs)
=======
=======
=======
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 22ee41c (Add login registration pages)
>>>>>>> 27ceb6f (Add login registration pages)
=======
=======
>>>>>>> c033601 (Rebased)
>>>>>>> 1577aeb (Rebased)
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 8c32a77 (Featire specs)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 56ef3ac (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 113da87 (Featire specs)
=======
=======
=======
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 9ec6862 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 2471c87 (Add login registration pages)
=======
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 3723aad (Featire specs)
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 65459e8 (Add login registration pages)
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 20256f8 (Featire specs)
=======
=======
=======
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> cacbab9 (Add login registration pages)
>>>>>>> cb955a0 (Add login registration pages)
=======
=======
>>>>>>> bf554f4 (Rebased)
>>>>>>> bebaea7 (Rebased)
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> b35d1f8 (Featire specs)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> a1fe6da (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 28fed3c (Featire specs)
=======
=======
=======
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> f182ac7 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> aeec696 (Add login registration pages)
=======
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ed6aebd (Featire specs)
=======
=======
=======
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 57da3ff (Add login registration pages)
<<<<<<< HEAD
>>>>>>> b5affcb (Add login registration pages)
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> 64d4167 (Featire specs)
=======
=======
=======
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> a624084 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 4f7c979 (Add login registration pages)
=======
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 13fd74f (Featire specs)
=======
=======
=======
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 6a9fede (Add login registration pages)
>>>>>>> 60943cc (Add login registration pages)
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1a9aba9 (Fix)
=======
>>>>>>> dacfb20 (Featire specs)
=======
>>>>>>> 93db8b1 (Featire specs)
=======
>>>>>>> 5f76842 (Featire specs)
=======
>>>>>>> 01d9256 (Add login registration pages)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> b26425c (Add login registration pages)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> 845289f (Add login registration pages)
=======
>>>>>>> d7fadcd (Featire specs)
=======
>>>>>>> 569a007 (Add login registration pages)
=======
=======
>>>>>>> 8f1bc14 (Fix)
>>>>>>> 49e3b70 (Fix)
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 65f3409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 78d0719 (Featire specs)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> c1749d5 (Featire specs)
<<<<<<< HEAD
>>>>>>> f861b82 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 1cb2e82 (Featire specs)
<<<<<<< HEAD
>>>>>>> 2fd2048 (Featire specs)
=======
=======
=======
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> fb10fe4 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 591c3b2 (Add login registration pages)
=======
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 8577deb (Featire specs)
<<<<<<< HEAD
>>>>>>> bc0ff2c (Featire specs)
=======
=======
=======
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 69eb97e (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 055b00f (Add login registration pages)
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> ebe5361 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9bf2aae (Featire specs)
=======
=======
=======
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 089f8cf (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e7ec208 (Add login registration pages)
=======
=======
=======
>>>>>>> 4552227 (Featire specs)
>>>>>>> d3d58e0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5ce1a6d (Featire specs)
=======
=======
=======
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 0edd9b7 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 61908af (Add login registration pages)
=======
=======
>>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
| config/initializers/permissions_policy.rb |
100.00 % |
11 |
0 |
0 |
0 |
0.00 |
| config/initializers/wrap_parameters.rb |
100.00 % |
14 |
2 |
2 |
0 |
1.50 |
| config/routes.rb |
100.00 % |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> cb74525 (Add login registration pages)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 8be9029 (Add login registration pages)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 7d58507 (Add login registration pages)
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 852864e (Add login registration pages)
=======
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> ccec311 (Add login registration pages)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> 8c3e531 (Add login registration pages)
=======
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> 140c987 (Add login registration pages)
=======
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> 0c3a150 (Add login registration pages)
=======
>>>>>>> 0b5b269 (Fix)
=======
>>>>>>> d6f7da8 (Featire specs)
=======
>>>>>>> f5da5ac (Featire specs)
=======
>>>>>>> 5f79779 (Featire specs)
=======
>>>>>>> 282f108 (Add login registration pages)
=======
>>>>>>> 56a05fb (Featire specs)
=======
>>>>>>> db0e854 (Add login registration pages)
=======
>>>>>>> 6d21330 (Featire specs)
=======
>>>>>>> 2cdd6f4 (Add login registration pages)
=======
>>>>>>> 27e3351 (Featire specs)
=======
>>>>>>> 3a43955 (Add login registration pages)
=======
>>>>>>> 1ac6be1 (Fix)
=======
>>>>>>> 4f7c979 (Add login registration pages)
=======
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> 60943cc (Add login registration pages)
=======
>>>>>>> 1a9aba9 (Fix)
=======
>>>>>>> dacfb20 (Featire specs)
=======
>>>>>>> 93db8b1 (Featire specs)
=======
>>>>>>> 5f76842 (Featire specs)
=======
>>>>>>> 01d9256 (Add login registration pages)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> b26425c (Add login registration pages)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> 845289f (Add login registration pages)
=======
>>>>>>> d7fadcd (Featire specs)
=======
>>>>>>> 569a007 (Add login registration pages)
=======
>>>>>>> 49e3b70 (Fix)
=======
>>>>>>> 78d0719 (Featire specs)
=======
>>>>>>> f861b82 (Featire specs)
=======
>>>>>>> 2fd2048 (Featire specs)
=======
>>>>>>> 591c3b2 (Add login registration pages)
=======
>>>>>>> bc0ff2c (Featire specs)
=======
>>>>>>> 055b00f (Add login registration pages)
=======
>>>>>>> 9bf2aae (Featire specs)
=======
>>>>>>> e7ec208 (Add login registration pages)
=======
>>>>>>> 5ce1a6d (Featire specs)
=======
>>>>>>> 61908af (Add login registration pages)
=======
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
=======
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> a624084 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> 6a9fede (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> af9487a (Add login registration pages)
=======
=======
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> 140c987 (Add login registration pages)
=======
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> 0c3a150 (Add login registration pages)
=======
=======
>>>>>>> b5affcb (Add login registration pages)
=======
=======
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> 4f7c979 (Add login registration pages)
=======
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> 60943cc (Add login registration pages)
17 |
9 |
9 |
=======
>>>>>>> 57da3ff (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 551f3c1 (Add login registration pages)
=======
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> 03c0867 (Add login registration pages)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 039806b (Add login registration pages)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 45f9f35 (Add login registration pages)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> 697ad44 (Add login registration pages)
=======
>>>>>>> 078304c (Rebased)
=======
>>>>>>> b4763a2 (Featire specs)
=======
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 0fc3bf0 (Add login registration pages)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> af9487a (Add login registration pages)
=======
>>>>>>> 3dc272d (Featire specs)
=======
>>>>>>> 27ceb6f (Add login registration pages)
=======
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 2471c87 (Add login registration pages)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 65459e8 (Add login registration pages)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> cb955a0 (Add login registration pages)
=======
>>>>>>> bebaea7 (Rebased)
=======
>>>>>>> b35d1f8 (Featire specs)
=======
>>>>>>> a1fe6da (Featire specs)
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> aeec696 (Add login registration pages)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> b5affcb (Add login registration pages)
5 |
3 |
3 |
=======
=======
>>>>>>> 22ee41c (Add login registration pages)
<<<<<<< HEAD
=======
>>>>>>> 22ee41c (Add login registration pages)
<<<<<<< HEAD
=======
>>>>>>> 22ee41c (Add login registration pages)
>>>>>>> e50f73e (Add login registration pages)
=======
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> 3dc272d (Featire specs)
<<<<<<< HEAD
7 |
4 |
4 |
=======
5 |
3 |
3 |
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> f182ac7 (Add login registration pages)
=======
>>>>>>> e54deeb (Featire specs)
17 |
9 |
9 |
>>>>>>> aca90e3 (Rebased)
=======
=======
>>>>>>> b6a32ab (Add login registration pages)
=======
>>>>>>> d780a52 (Rebased)
=======
>>>>>>> 83979de (Featire specs)
=======
>>>>>>> b3f2049 (Featire specs)
=======
>>>>>>> 12bcf81 (Featire specs)
=======
>>>>>>> 264ef06 (Add login registration pages)
=======
>>>>>>> fd3e35e (Featire specs)
=======
>>>>>>> a1a8477 (Add login registration pages)
=======
>>>>>>> 1677b1a (Featire specs)
=======
>>>>>>> 551615f (Add login registration pages)
=======
>>>>>>> d52ad35 (Rebased)
5 |
3 |
3 |
=======
=======
>>>>>>> 22ee41c (Add login registration pages)
=======
5 |
3 |
3 |
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
7 |
4 |
4 |
=======
5 |
3 |
3 |
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 551f3c1 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> d96cf3b (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> e50f73e (Add login registration pages)
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
=======
>>>>>>> 5c33a07 (Featire specs)
=======
=======
>>>>>>> 03c0867 (Add login registration pages)
=======
>>>>>>> 5c33a07 (Featire specs)
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
>>>>>>> af9487a (Add login registration pages)
=======
>>>>>>> 5c33a07 (Featire specs)
=======
=======
>>>>>>> 27ceb6f (Add login registration pages)
=======
>>>>>>> 5c33a07 (Featire specs)
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
>>>>>>> b5affcb (Add login registration pages)
7 |
4 |
4 |
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> af9487a (Add login registration pages)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> b5affcb (Add login registration pages)
=======
>>>>>>> 64d4167 (Featire specs)
>>>>>>> 22ee41c (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b6a32ab (Add login registration pages)
=======
=======
>>>>>>> ee78f39 (Rebased)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> f182ac7 (Add login registration pages)
=======
>>>>>>> e54deeb (Featire specs)
17 |
9 |
9 |
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d780a52 (Rebased)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9ec6862 (Add login registration pages)
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> cacbab9 (Add login registration pages)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
>>>>>>> 9ec6862 (Add login registration pages)
>>>>>>> cb74525 (Add login registration pages)
=======
>>>>>>> 904663c (Featire specs)
=======
=======
>>>>>>> 57a2e05 (Add login registration pages)
>>>>>>> 8be9029 (Add login registration pages)
=======
>>>>>>> e5752db (Featire specs)
=======
=======
>>>>>>> cacbab9 (Add login registration pages)
>>>>>>> 7d58507 (Add login registration pages)
=======
>>>>>>> 113da87 (Featire specs)
=======
=======
>>>>>>> 9ec6862 (Add login registration pages)
>>>>>>> 2471c87 (Add login registration pages)
17 |
9 |
9 |
=======
17 |
9 |
9 |
>>>>>>> 9620751 (Featire specs)
=======
5 |
3 |
3 |
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> a1fe6da (Featire specs)
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 83979de (Featire specs)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
5 |
3 |
3 |
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> a9bf83f (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
=======
5 |
3 |
3 |
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 852864e (Add login registration pages)
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 12bcf81 (Featire specs)
=======
=======
>>>>>>> b832d45 (Featire specs)
>>>>>>> cb74525 (Add login registration pages)
=======
=======
>>>>>>> f182ac7 (Add login registration pages)
=======
7 |
4 |
4 |
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 852864e (Add login registration pages)
=======
>>>>>>> ee5242b (Featire specs)
>>>>>>> 9ec6862 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 264ef06 (Add login registration pages)
=======
=======
>>>>>>> 9ec6862 (Add login registration pages)
>>>>>>> 904663c (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
5 |
3 |
3 |
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ee5242b (Featire specs)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3e35e (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 8be9029 (Add login registration pages)
=======
=======
7 |
4 |
4 |
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 57a2e05 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> a1a8477 (Add login registration pages)
=======
=======
>>>>>>> 57a2e05 (Add login registration pages)
>>>>>>> e5752db (Featire specs)
=======
=======
>>>>>>> 3b03895 (Featire specs)
=======
5 |
3 |
3 |
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> ccec311 (Add login registration pages)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 1677b1a (Featire specs)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 7d58507 (Add login registration pages)
=======
=======
>>>>>>> a624084 (Add login registration pages)
=======
7 |
4 |
4 |
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> cacbab9 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 551615f (Add login registration pages)
=======
=======
>>>>>>> 49e8a6c (Rebased)
=======
17 |
9 |
9 |
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d52ad35 (Rebased)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> e50f73e (Add login registration pages)
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 9ec6862 (Add login registration pages)
>>>>>>> cb74525 (Add login registration pages)
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 57a2e05 (Add login registration pages)
>>>>>>> 8be9029 (Add login registration pages)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 7d58507 (Add login registration pages)
=======
>>>>>>> 49e8a6c (Rebased)
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> f182ac7 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 852864e (Add login registration pages)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 551f3c1 (Add login registration pages)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> a624084 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> ccec311 (Add login registration pages)
=======
=======
=======
5 |
3 |
3 |
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
=======
7 |
4 |
4 |
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 6a9fede (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 8c3e531 (Add login registration pages)
=======
=======
31 |
17 |
17 |
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> 22ee41c (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 03c0867 (Add login registration pages)
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> f182ac7 (Add login registration pages)
=======
>>>>>>> e54deeb (Featire specs)
=======
=======
>>>>>>> 1577aeb (Rebased)
17 |
9 |
9 |
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 836a973 (Rebased)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 9ec6862 (Add login registration pages)
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> cacbab9 (Add login registration pages)
=======
>>>>>>> 8b420cf (Featire specs)
=======
=======
>>>>>>> 57a2e05 (Add login registration pages)
>>>>>>> 65459e8 (Add login registration pages)
=======
>>>>>>> 20256f8 (Featire specs)
=======
=======
>>>>>>> cacbab9 (Add login registration pages)
>>>>>>> cb955a0 (Add login registration pages)
17 |
9 |
9 |
=======
<<<<<<< HEAD
>>>>>>> 8c32a77 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
17 |
9 |
9 |
<<<<<<< HEAD
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
=======
17 |
9 |
9 |
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> b35d1f8 (Featire specs)
5 |
3 |
3 |
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b35d1f8 (Featire specs)
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 2a25e4c (Featire specs)
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
=======
>>>>>>> a636fda (Featire specs)
=======
=======
>>>>>>> 56ef3ac (Featire specs)
5 |
3 |
3 |
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 3e9f99d (Featire specs)
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
=======
5 |
3 |
3 |
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5be567f (Featire specs)
=======
=======
=======
>>>>>>> f182ac7 (Add login registration pages)
=======
7 |
4 |
4 |
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9ec6862 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 039806b (Add login registration pages)
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
5 |
3 |
3 |
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 2ee03d3 (Featire specs)
=======
=======
=======
7 |
4 |
4 |
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 57a2e05 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 45f9f35 (Add login registration pages)
=======
=======
=======
>>>>>>> 3b03895 (Featire specs)
=======
5 |
3 |
3 |
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5506bd0 (Featire specs)
=======
=======
=======
>>>>>>> a624084 (Add login registration pages)
=======
7 |
4 |
4 |
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> cacbab9 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 697ad44 (Add login registration pages)
=======
=======
17 |
9 |
9 |
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
>>>>>>> 078304c (Rebased)
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> b4763a2 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> bcd09ab (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> c006a44 (Featire specs)
=======
=======
>>>>>>> f182ac7 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 0fc3bf0 (Add login registration pages)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 848bfa2 (Featire specs)
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
<<<<<<< HEAD
>>>>>>> af9487a (Add login registration pages)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9ca3b84 (Featire specs)
=======
=======
>>>>>>> a624084 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 140c987 (Add login registration pages)
=======
=======
=======
5 |
3 |
3 |
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> fefbd35 (Featire specs)
=======
=======
=======
7 |
4 |
4 |
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 6a9fede (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 0c3a150 (Add login registration pages)
=======
=======
31 |
17 |
17 |
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
>>>>>>> 0b5b269 (Fix)
=======
=======
=======
>>>>>>> 864f339 (Featire specs)
=======
>>>>>>> a2de409 (Featire specs)
=======
>>>>>>> 0005d4a (Add login registration pages)
=======
>>>>>>> e54ceb0 (Featire specs)
=======
>>>>>>> 58d403b (Add login registration pages)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
>>>>>>> b575a28 (Add login registration pages)
=======
>>>>>>> 5a0bcc7 (Featire specs)
=======
>>>>>>> 5caffae (Add login registration pages)
31 |
17 |
17 |
=======
5 |
3 |
3 |
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9dc109d (Featire specs)
<<<<<<< HEAD
>>>>>>> d6f7da8 (Featire specs)
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
5 |
3 |
3 |
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
>>>>>>> f5da5ac (Featire specs)
=======
=======
=======
5 |
3 |
3 |
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5f79779 (Featire specs)
=======
=======
=======
7 |
4 |
4 |
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 0005d4a (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 282f108 (Add login registration pages)
=======
=======
=======
5 |
3 |
3 |
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 56a05fb (Featire specs)
=======
=======
=======
7 |
4 |
4 |
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 58d403b (Add login registration pages)
<<<<<<< HEAD
>>>>>>> db0e854 (Add login registration pages)
=======
=======
=======
5 |
3 |
3 |
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6d21330 (Featire specs)
=======
=======
=======
7 |
4 |
4 |
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> b575a28 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 2cdd6f4 (Add login registration pages)
=======
=======
=======
5 |
3 |
3 |
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 27e3351 (Featire specs)
=======
=======
=======
7 |
4 |
4 |
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 5caffae (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3a43955 (Add login registration pages)
=======
=======
>>>>>>> 49e3b70 (Fix)
=======
33 |
18 |
18 |
>>>>>>> 8f1bc14 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1ac6be1 (Fix)
=======
5 |
3 |
3 |
>>>>>>> cde4834 (Manifest_cache true)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 3dc272d (Featire specs)
=======
>>>>>>> 22ee41c (Add login registration pages)
>>>>>>> 27ceb6f (Add login registration pages)
=======
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 56ef3ac (Featire specs)
=======
=======
>>>>>>> a1fe6da (Featire specs)
=======
>>>>>>> 28fed3c (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
=======
5 |
3 |
3 |
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 113da87 (Featire specs)
=======
=======
=======
>>>>>>> f182ac7 (Add login registration pages)
=======
7 |
4 |
4 |
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9ec6862 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 2471c87 (Add login registration pages)
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
5 |
3 |
3 |
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 8b420cf (Featire specs)
=======
=======
=======
7 |
4 |
4 |
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 57a2e05 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 65459e8 (Add login registration pages)
=======
=======
=======
>>>>>>> 3b03895 (Featire specs)
=======
5 |
3 |
3 |
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 20256f8 (Featire specs)
=======
=======
=======
>>>>>>> a624084 (Add login registration pages)
=======
7 |
4 |
4 |
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> cacbab9 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> cb955a0 (Add login registration pages)
=======
=======
17 |
9 |
9 |
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
>>>>>>> bebaea7 (Rebased)
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> b35d1f8 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> a1fe6da (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 28fed3c (Featire specs)
=======
=======
>>>>>>> f182ac7 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> aeec696 (Add login registration pages)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ed6aebd (Featire specs)
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
<<<<<<< HEAD
>>>>>>> b5affcb (Add login registration pages)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> 64d4167 (Featire specs)
=======
=======
>>>>>>> a624084 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 4f7c979 (Add login registration pages)
=======
=======
=======
5 |
3 |
3 |
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 13fd74f (Featire specs)
=======
=======
=======
7 |
4 |
4 |
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 6a9fede (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 60943cc (Add login registration pages)
=======
=======
31 |
17 |
17 |
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
>>>>>>> 1a9aba9 (Fix)
=======
=======
=======
>>>>>>> 864f339 (Featire specs)
=======
>>>>>>> a2de409 (Featire specs)
=======
>>>>>>> 0005d4a (Add login registration pages)
=======
>>>>>>> e54ceb0 (Featire specs)
=======
>>>>>>> 58d403b (Add login registration pages)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
>>>>>>> b575a28 (Add login registration pages)
=======
>>>>>>> 5a0bcc7 (Featire specs)
=======
>>>>>>> 5caffae (Add login registration pages)
31 |
17 |
17 |
=======
=======
=======
>>>>>>> c1749d5 (Featire specs)
=======
>>>>>>> 1cb2e82 (Featire specs)
=======
>>>>>>> fb10fe4 (Add login registration pages)
=======
>>>>>>> 8577deb (Featire specs)
=======
>>>>>>> 69eb97e (Add login registration pages)
=======
>>>>>>> ebe5361 (Featire specs)
=======
>>>>>>> 089f8cf (Add login registration pages)
=======
>>>>>>> d3d58e0 (Featire specs)
=======
>>>>>>> 0edd9b7 (Add login registration pages)
33 |
18 |
18 |
>>>>>>> 78d0719 (Featire specs)
=======
5 |
3 |
3 |
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9dc109d (Featire specs)
<<<<<<< HEAD
>>>>>>> dacfb20 (Featire specs)
=======
=======
=======
5 |
3 |
3 |
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
>>>>>>> 93db8b1 (Featire specs)
=======
=======
=======
5 |
3 |
3 |
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5f76842 (Featire specs)
=======
=======
=======
7 |
4 |
4 |
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 0005d4a (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 01d9256 (Add login registration pages)
=======
=======
=======
5 |
3 |
3 |
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
>>>>>>> ea0650c (Featire specs)
=======
=======
=======
7 |
4 |
4 |
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 58d403b (Add login registration pages)
<<<<<<< HEAD
>>>>>>> b26425c (Add login registration pages)
=======
=======
=======
5 |
3 |
3 |
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
>>>>>>> a038b16 (Featire specs)
=======
=======
=======
7 |
4 |
4 |
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> b575a28 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 845289f (Add login registration pages)
=======
=======
=======
5 |
3 |
3 |
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
>>>>>>> d7fadcd (Featire specs)
=======
=======
=======
7 |
4 |
4 |
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 5caffae (Add login registration pages)
>>>>>>> 569a007 (Add login registration pages)
=======
>>>>>>> 49e3b70 (Fix)
=======
>>>>>>> 65f3409 (Featire specs)
>>>>>>> 78d0719 (Featire specs)
=======
>>>>>>> 65f3409 (Featire specs)
=======
=======
5 |
3 |
3 |
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> c1749d5 (Featire specs)
<<<<<<< HEAD
>>>>>>> f861b82 (Featire specs)
=======
=======
=======
5 |
3 |
3 |
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 1cb2e82 (Featire specs)
<<<<<<< HEAD
>>>>>>> 2fd2048 (Featire specs)
=======
=======
=======
7 |
4 |
4 |
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
>>>>>>> fb10fe4 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 591c3b2 (Add login registration pages)
=======
=======
=======
5 |
3 |
3 |
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8577deb (Featire specs)
<<<<<<< HEAD
>>>>>>> bc0ff2c (Featire specs)
=======
=======
=======
7 |
4 |
4 |
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 69eb97e (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 055b00f (Add login registration pages)
=======
=======
=======
5 |
3 |
3 |
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> ebe5361 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9bf2aae (Featire specs)
=======
=======
=======
7 |
4 |
4 |
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 089f8cf (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e7ec208 (Add login registration pages)
=======
=======
=======
5 |
3 |
3 |
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> d3d58e0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5ce1a6d (Featire specs)
=======
=======
=======
7 |
4 |
4 |
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 0edd9b7 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 61908af (Add login registration pages)
=======
=======
33 |
18 |
18 |
>>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
0 |
1.00 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 3dc272d (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 715fac2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 715fac2 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 9bebee5 (Manifest_cache true)
=======
>>>>>>> ee5935f (Manifest_cache true)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 394c6f3 (Manifest_cache true)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 0b43b18 (Manifest_cache true)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> caaaa41 (Manifest_cache true)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> 8874887 (Manifest_cache true)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 078304c (Rebased)
=======
>>>>>>> d15fe1d (Fix)
=======
>>>>>>> b4763a2 (Featire specs)
=======
>>>>>>> dcf74e1 (Manifest_cache true)
=======
>>>>>>> d66884b (Manifest_cache true)
=======
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> 022e63e (Manifest_cache true)
=======
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 10bdfea (Manifest_cache true)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> d70f030 (Manifest_cache true)
=======
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> cae047f (Manifest_cache true)
=======
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> a9e654b (Manifest_cache true)
=======
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0b5b269 (Fix)
=======
>>>>>>> d6f7da8 (Featire specs)
=======
>>>>>>> ab67c96 (Manifest_cache true)
=======
>>>>>>> 4e0a8d9 (Manifest_cache true)
=======
>>>>>>> f5da5ac (Featire specs)
=======
>>>>>>> 036bb32 (Manifest_cache true)
=======
>>>>>>> 5f79779 (Featire specs)
=======
>>>>>>> 3e8974a (Manifest_cache true)
=======
>>>>>>> 56a05fb (Featire specs)
=======
>>>>>>> 23e9df9 (Manifest_cache true)
=======
>>>>>>> da83d1a (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6d21330 (Featire specs)
=======
>>>>>>> 9617beb (Manifest_cache true)
=======
>>>>>>> a2a431e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 27e3351 (Featire specs)
=======
>>>>>>> b40a04e (Manifest_cache true)
=======
>>>>>>> e733663 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1ac6be1 (Fix)
=======
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 902b803 (Manifest_cache true)
=======
>>>>>>> 0c9131d (Manifest_cache true)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> b763f5b (Manifest_cache true)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> be2f578 (Manifest_cache true)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> ed97c39 (Manifest_cache true)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 587ce47 (Manifest_cache true)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
>>>>>>> bebaea7 (Rebased)
=======
>>>>>>> eaef86a (Fix)
=======
>>>>>>> b35d1f8 (Featire specs)
=======
>>>>>>> 5518ff0 (Manifest_cache true)
=======
>>>>>>> 75be480 (Manifest_cache true)
=======
>>>>>>> a1fe6da (Featire specs)
=======
>>>>>>> 027f794 (Manifest_cache true)
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> e2bfd89 (Manifest_cache true)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> d1bae53 (Manifest_cache true)
=======
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> 35d9b13 (Manifest_cache true)
=======
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> f7f7abc (Manifest_cache true)
=======
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1a9aba9 (Fix)
=======
>>>>>>> dacfb20 (Featire specs)
=======
>>>>>>> 459d812 (Manifest_cache true)
=======
>>>>>>> 3fef583 (Manifest_cache true)
=======
>>>>>>> 93db8b1 (Featire specs)
=======
>>>>>>> b746b60 (Manifest_cache true)
=======
>>>>>>> 5f76842 (Featire specs)
=======
>>>>>>> e965665 (Manifest_cache true)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> 10b6c72 (Manifest_cache true)
=======
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> a77cc8a (Manifest_cache true)
=======
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d7fadcd (Featire specs)
=======
>>>>>>> 39467b5 (Manifest_cache true)
=======
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 49e3b70 (Fix)
=======
>>>>>>> 78d0719 (Featire specs)
=======
>>>>>>> 6edce20 (Manifest_cache true)
=======
>>>>>>> 04108c4 (Manifest_cache true)
=======
>>>>>>> f861b82 (Featire specs)
=======
>>>>>>> d8298a1 (Manifest_cache true)
=======
>>>>>>> 2fd2048 (Featire specs)
=======
>>>>>>> bdea3aa (Manifest_cache true)
=======
>>>>>>> bc0ff2c (Featire specs)
=======
>>>>>>> 07682bd (Manifest_cache true)
=======
>>>>>>> 45f6de0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9bf2aae (Featire specs)
=======
>>>>>>> e2d040a (Manifest_cache true)
=======
>>>>>>> 7718476 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5ce1a6d (Featire specs)
=======
>>>>>>> 307ac6e (Manifest_cache true)
=======
>>>>>>> cea736b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d96cf3b (Featire specs)
=======
=======
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f764a87 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d780a52 (Rebased)
=======
=======
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 83979de (Featire specs)
=======
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d0f5c14 (Manifest_cache true)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> c8cdb08 (Manifest_cache true)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> b15044a (Manifest_cache true)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 864f339 (Featire specs)
=======
>>>>>>> b5f64c6 (Manifest_cache true)
=======
>>>>>>> a2de409 (Featire specs)
=======
>>>>>>> 8c7bad7 (Manifest_cache true)
=======
>>>>>>> e54ceb0 (Featire specs)
=======
>>>>>>> 1bfc7a6 (Manifest_cache true)
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
>>>>>>> 3b839af (Manifest_cache true)
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5a0bcc7 (Featire specs)
=======
>>>>>>> 0832698 (Manifest_cache true)
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
=======
>>>>>>> c1749d5 (Featire specs)
=======
>>>>>>> 3c386ca (Manifest_cache true)
=======
>>>>>>> 1cb2e82 (Featire specs)
=======
>>>>>>> fe7e312 (Manifest_cache true)
=======
>>>>>>> 8577deb (Featire specs)
=======
>>>>>>> 94d9078 (Manifest_cache true)
=======
>>>>>>> 7b112c2 (Fix book_spec decrease quantity and price)
=======
>>>>>>> ebe5361 (Featire specs)
=======
>>>>>>> 2956182 (Manifest_cache true)
=======
>>>>>>> a455e8a (Fix book_spec decrease quantity and price)
=======
>>>>>>> d3d58e0 (Featire specs)
=======
>>>>>>> 9d9ff14 (Manifest_cache true)
=======
>>>>>>> 59078f6 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 6fa625b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> cfd1f7f (Manifest_cache true)
=======
=======
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
>>>>>>> 7945032 (Manifest_cache true)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> c8cdb08 (Manifest_cache true)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> b15044a (Manifest_cache true)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 864f339 (Featire specs)
=======
>>>>>>> b5f64c6 (Manifest_cache true)
=======
>>>>>>> a2de409 (Featire specs)
=======
>>>>>>> 8c7bad7 (Manifest_cache true)
=======
>>>>>>> e54ceb0 (Featire specs)
=======
>>>>>>> 1bfc7a6 (Manifest_cache true)
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
>>>>>>> 3b839af (Manifest_cache true)
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5a0bcc7 (Featire specs)
=======
>>>>>>> 0832698 (Manifest_cache true)
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 6fa625b (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0bdcc5e (Manifest_cache true)
=======
=======
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
=======
=======
>>>>>>> d66884b (Manifest_cache true)
=======
=======
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
=======
=======
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1d59aaa (Fix)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 2a25e4c (Featire specs)
=======
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
>>>>>>> 9bebee5 (Manifest_cache true)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> c8cdb08 (Manifest_cache true)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> b15044a (Manifest_cache true)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 6fa625b (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> ee5935f (Manifest_cache true)
=======
=======
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> d15fe1d (Fix)
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> b4763a2 (Featire specs)
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> dcf74e1 (Manifest_cache true)
=======
>>>>>>> d66884b (Manifest_cache true)
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 0b5b269 (Fix)
=======
=======
>>>>>>> 9dc109d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d6f7da8 (Featire specs)
=======
=======
>>>>>>> 866aee4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ab67c96 (Manifest_cache true)
=======
=======
>>>>>>> 3fef583 (Manifest_cache true)
=======
=======
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 4e7b845 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4e0a8d9 (Manifest_cache true)
=======
=======
>>>>>>> 8f1bc14 (Fix)
<<<<<<< HEAD
>>>>>>> 1ac6be1 (Fix)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 8c32a77 (Featire specs)
=======
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
>>>>>>> 902b803 (Manifest_cache true)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> c8cdb08 (Manifest_cache true)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 6fa625b (Manifest_cache true)
>>>>>>> 0c9131d (Manifest_cache true)
=======
=======
>>>>>>> a5d032d (Fix)
>>>>>>> eaef86a (Fix)
=======
=======
>>>>>>> 9620751 (Featire specs)
>>>>>>> b35d1f8 (Featire specs)
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> 5518ff0 (Manifest_cache true)
=======
=======
=======
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 75be480 (Manifest_cache true)
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1a9aba9 (Fix)
=======
=======
>>>>>>> 9dc109d (Featire specs)
>>>>>>> dacfb20 (Featire specs)
=======
=======
>>>>>>> 866aee4 (Manifest_cache true)
>>>>>>> 459d812 (Manifest_cache true)
=======
>>>>>>> 3fef583 (Manifest_cache true)
=======
=======
>>>>>>> 8f1bc14 (Fix)
>>>>>>> 49e3b70 (Fix)
=======
=======
>>>>>>> 65f3409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 78d0719 (Featire specs)
=======
=======
>>>>>>> e991554 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 6edce20 (Manifest_cache true)
=======
=======
=======
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> b8aab1a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 04108c4 (Manifest_cache true)
=======
=======
>>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
| spec/decorators/author_decorator_spec.rb |
100.00 % |
9 |
5 |
5 |
0 |
1.60 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c033601 (Rebased)
>>>>>>> ee78f39 (Rebased)
spec/decorators/author_decorator_spec.rb |
100.00 % |
9 |
5 |
5 |
0 |
<<<<<<< HEAD
1.29 |
<<<<<<< HEAD
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
>>>>>>> a5d032d (Fix)
=======
1.60 |
>>>>>>> ee78f39 (Rebased)
=======
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1d59aaa (Fix)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c033601 (Rebased)
>>>>>>> 836a973 (Rebased)
spec/decorators/author_decorator_spec.rb |
100.00 % |
9 |
5 |
5 |
0 |
<<<<<<< HEAD
1.29 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
<<<<<<< HEAD
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
=======
1.60 |
>>>>>>> 836a973 (Rebased)
=======
=======
>>>>>>> d15fe1d (Fix)
=======
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0b5b269 (Fix)
=======
>>>>>>> da83d1a (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1ac6be1 (Fix)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
=======
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c033601 (Rebased)
>>>>>>> 1577aeb (Rebased)
spec/decorators/author_decorator_spec.rb |
100.00 % |
9 |
5 |
5 |
0 |
<<<<<<< HEAD
1.29 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> d15fe1d (Fix)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
>>>>>>> 0b5b269 (Fix)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> da83d1a (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2a431e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> e733663 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 8f1bc14 (Fix)
>>>>>>> 1ac6be1 (Fix)
=======
=======
=======
1.60 |
>>>>>>> 1577aeb (Rebased)
=======
=======
>>>>>>> eaef86a (Fix)
=======
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1a9aba9 (Fix)
=======
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 49e3b70 (Fix)
=======
>>>>>>> 45f6de0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7b112c2 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a455e8a (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 59078f6 (Fix book_spec decrease quantity and price)
spec/decorators/author_decorator_spec.rb |
100.00 % |
13 |
7 |
7 |
0 |
1.29 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
=======
>>>>>>> 59078f6 (Fix book_spec decrease quantity and price)
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> eaef86a (Fix)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
>>>>>>> 1a9aba9 (Fix)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 8f1bc14 (Fix)
<<<<<<< HEAD
>>>>>>> 49e3b70 (Fix)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 7b112c2 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 45f6de0 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> a455e8a (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 7718476 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 59078f6 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> cea736b (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> a5d032d (Fix)
>>>>>>> eaef86a (Fix)
=======
=======
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1a9aba9 (Fix)
=======
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 49e3b70 (Fix)
=======
>>>>>>> 45f6de0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7718476 (Fix book_spec decrease quantity and price)
=======
>>>>>>> cea736b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
=======
>>>>>>> a5d032d (Fix)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
>>>>>>> 1a9aba9 (Fix)
=======
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 8f1bc14 (Fix)
<<<<<<< HEAD
>>>>>>> 49e3b70 (Fix)
=======
=======
>>>>>>> 7b112c2 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 45f6de0 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> a455e8a (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 7718476 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 59078f6 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> cea736b (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
| spec/decorators/book_decorator_spec.rb |
100.00 % |
36 |
15 |
15 |
0 |
1.50 |
>>>>>>> cde4834 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> f764a87 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d780a52 (Rebased)
=======
>>>>>>> c54769d (Fix book_spec decrease quantity and price)
=======
>>>>>>> c346782 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> a5d032d (Fix)
>>>>>>> b28889f (Fix)
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0b5b269 (Fix)
=======
>>>>>>> da83d1a (Fix book_spec decrease quantity and price)
=======
>>>>>>> a2a431e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e733663 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1ac6be1 (Fix)
=======
>>>>>>> a5d032d (Fix)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> a5d032d (Fix)
>>>>>>> d15fe1d (Fix)
=======
=======
>>>>>>> a5d032d (Fix)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 0b5b269 (Fix)
=======
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> da83d1a (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2a431e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> e733663 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 8f1bc14 (Fix)
>>>>>>> 1ac6be1 (Fix)
| spec/decorators/book_decorator_spec.rb |
100.00 % |
36 |
15 |
15 |
0 |
1.73 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
| spec/factories/addresses.rb |
100.00 % |
4 |
2 |
2 |
0 |
1.00 |
=======
=======
>>>>>>> d780a52 (Rebased)
=======
>>>>>>> cfd1f7f (Manifest_cache true)
=======
>>>>>>> b28889f (Fix)
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 0bdcc5e (Manifest_cache true)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 307f31f (Manifest_cache true)
=======
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> ee5935f (Manifest_cache true)
=======
>>>>>>> d15fe1d (Fix)
=======
>>>>>>> d66884b (Manifest_cache true)
=======
>>>>>>> 0b5b269 (Fix)
=======
>>>>>>> 4e0a8d9 (Manifest_cache true)
=======
>>>>>>> 1ac6be1 (Fix)
=======
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 0c9131d (Manifest_cache true)
=======
>>>>>>> eaef86a (Fix)
=======
>>>>>>> 75be480 (Manifest_cache true)
=======
>>>>>>> 1a9aba9 (Fix)
=======
>>>>>>> 3fef583 (Manifest_cache true)
=======
>>>>>>> 49e3b70 (Fix)
=======
>>>>>>> 04108c4 (Manifest_cache true)
=======
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
1.50 |
=======
1.46 |
=======
<<<<<<< HEAD
=======
=======
>>>>>>> bd8bda4 (Manifest_cache true)
=======
>>>>>>> aa7b40c (Manifest_cache true)
=======
>>>>>>> 183b6c5 (Manifest_cache true)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
spec/decorators/book_decorator_spec.rb |
100.00 % |
29 |
13 |
13 |
0 |
<<<<<<< HEAD
1.50 |
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
=======
>>>>>>> bd8bda4 (Manifest_cache true)
=======
>>>>>>> aa7b40c (Manifest_cache true)
=======
>>>>>>> 183b6c5 (Manifest_cache true)
=======
1.46 |
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f764a87 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 6fa625b (Manifest_cache true)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4e7b845 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 75be480 (Manifest_cache true)
=======
=======
>>>>>>> 4e7b845 (Manifest_cache true)
>>>>>>> 3fef583 (Manifest_cache true)
=======
>>>>>>> b8aab1a (Manifest_cache true)
>>>>>>> 04108c4 (Manifest_cache true)
1.73 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5518ff0 (Manifest_cache true)
=======
>>>>>>> 459d812 (Manifest_cache true)
=======
>>>>>>> 6edce20 (Manifest_cache true)
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> d780a52 (Rebased)
=======
=======
=======
1.46 |
>>>>>>> 7375d4b (Manifest_cache true)
=======
=======
>>>>>>> bd8bda4 (Manifest_cache true)
=======
>>>>>>> aa7b40c (Manifest_cache true)
=======
>>>>>>> 183b6c5 (Manifest_cache true)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
spec/decorators/book_decorator_spec.rb |
100.00 % |
29 |
13 |
13 |
0 |
<<<<<<< HEAD
1.50 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b9cc4e9 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d0f5c14 (Manifest_cache true)
=======
=======
=======
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 6fa625b (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> cfd1f7f (Manifest_cache true)
=======
=======
=======
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> c8cdb08 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e031bce (Manifest_cache true)
=======
=======
=======
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 02ba384 (Manifest_cache true)
=======
=======
=======
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 24b58e6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 926dfe5 (Manifest_cache true)
=======
=======
=======
1.46 |
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c54769d (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
spec/decorators/book_decorator_spec.rb |
100.00 % |
29 |
13 |
13 |
0 |
<<<<<<< HEAD
1.50 |
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 00f8b58 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1830ff1 (Manifest_cache true)
=======
=======
=======
1.46 |
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7f7abc (Manifest_cache true)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c346782 (Fix book_spec decrease quantity and price)
=======
=======
1.73 |
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
=======
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 6fa625b (Manifest_cache true)
1.73 |
<<<<<<< HEAD
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> ee78f39 (Rebased)
=======
=======
=======
1.46 |
>>>>>>> 7375d4b (Manifest_cache true)
=======
=======
>>>>>>> bd8bda4 (Manifest_cache true)
=======
>>>>>>> aa7b40c (Manifest_cache true)
=======
>>>>>>> 183b6c5 (Manifest_cache true)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
spec/decorators/book_decorator_spec.rb |
100.00 % |
29 |
13 |
13 |
0 |
<<<<<<< HEAD
1.50 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b9cc4e9 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 7945032 (Manifest_cache true)
=======
=======
=======
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 6fa625b (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0bdcc5e (Manifest_cache true)
=======
=======
=======
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> c8cdb08 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b00b319 (Manifest_cache true)
=======
=======
=======
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 86d584a (Manifest_cache true)
=======
=======
=======
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 24b58e6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b459807 (Manifest_cache true)
=======
=======
=======
1.46 |
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
spec/decorators/book_decorator_spec.rb |
100.00 % |
29 |
13 |
13 |
0 |
<<<<<<< HEAD
1.50 |
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 00f8b58 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
=======
=======
1.46 |
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
1.73 |
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> 872e675 (Fix)
=======
=======
=======
1.46 |
>>>>>>> 7375d4b (Manifest_cache true)
=======
=======
>>>>>>> bd8bda4 (Manifest_cache true)
=======
>>>>>>> aa7b40c (Manifest_cache true)
=======
>>>>>>> 183b6c5 (Manifest_cache true)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
spec/decorators/book_decorator_spec.rb |
100.00 % |
29 |
13 |
13 |
0 |
<<<<<<< HEAD
1.50 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
=======
=======
=======
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
=======
=======
=======
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
=======
=======
=======
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 35d17b9 (Manifest_cache true)
=======
=======
=======
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> add330c (Manifest_cache true)
=======
=======
=======
1.46 |
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
spec/decorators/book_decorator_spec.rb |
100.00 % |
29 |
13 |
13 |
0 |
<<<<<<< HEAD
1.50 |
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 15bff2e (Manifest_cache true)
=======
=======
=======
1.46 |
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
spec/decorators/book_decorator_spec.rb |
100.00 % |
29 |
13 |
13 |
0 |
<<<<<<< HEAD
1.50 |
>>>>>>> 998f08d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 6c71f00 (Manifest_cache true)
=======
=======
=======
1.46 |
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
=======
1.73 |
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 6fa625b (Manifest_cache true)
1.73 |
<<<<<<< HEAD
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> 836a973 (Rebased)
=======
=======
=======
1.46 |
>>>>>>> 7375d4b (Manifest_cache true)
=======
=======
>>>>>>> bd8bda4 (Manifest_cache true)
=======
>>>>>>> aa7b40c (Manifest_cache true)
=======
>>>>>>> 183b6c5 (Manifest_cache true)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
spec/decorators/book_decorator_spec.rb |
100.00 % |
29 |
13 |
13 |
0 |
<<<<<<< HEAD
1.50 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b9cc4e9 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 9bebee5 (Manifest_cache true)
=======
=======
=======
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 6fa625b (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> ee5935f (Manifest_cache true)
=======
=======
=======
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> c8cdb08 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 394c6f3 (Manifest_cache true)
=======
=======
=======
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0b43b18 (Manifest_cache true)
=======
=======
=======
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 24b58e6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> caaaa41 (Manifest_cache true)
=======
=======
=======
1.46 |
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
spec/decorators/book_decorator_spec.rb |
100.00 % |
29 |
13 |
13 |
0 |
<<<<<<< HEAD
1.50 |
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 00f8b58 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8874887 (Manifest_cache true)
=======
=======
=======
1.46 |
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
=======
1.73 |
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> d15fe1d (Fix)
=======
=======
=======
1.46 |
>>>>>>> 7375d4b (Manifest_cache true)
=======
=======
>>>>>>> bd8bda4 (Manifest_cache true)
=======
>>>>>>> aa7b40c (Manifest_cache true)
=======
>>>>>>> 183b6c5 (Manifest_cache true)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
spec/decorators/book_decorator_spec.rb |
100.00 % |
29 |
13 |
13 |
0 |
<<<<<<< HEAD
1.50 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> dcf74e1 (Manifest_cache true)
=======
=======
=======
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d66884b (Manifest_cache true)
=======
=======
=======
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 022e63e (Manifest_cache true)
=======
=======
=======
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 10bdfea (Manifest_cache true)
=======
=======
=======
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d70f030 (Manifest_cache true)
=======
=======
=======
1.46 |
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
spec/decorators/book_decorator_spec.rb |
100.00 % |
29 |
13 |
13 |
0 |
<<<<<<< HEAD
1.50 |
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> cae047f (Manifest_cache true)
=======
=======
=======
1.46 |
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
spec/decorators/book_decorator_spec.rb |
100.00 % |
29 |
13 |
13 |
0 |
<<<<<<< HEAD
1.50 |
>>>>>>> 998f08d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a9e654b (Manifest_cache true)
=======
=======
=======
1.46 |
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
=======
1.73 |
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 0b5b269 (Fix)
=======
=======
=======
1.46 |
>>>>>>> 7375d4b (Manifest_cache true)
=======
=======
>>>>>>> bd8bda4 (Manifest_cache true)
=======
>>>>>>> aa7b40c (Manifest_cache true)
=======
>>>>>>> 183b6c5 (Manifest_cache true)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
spec/decorators/book_decorator_spec.rb |
100.00 % |
29 |
13 |
13 |
0 |
<<<<<<< HEAD
1.50 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 866aee4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> ab67c96 (Manifest_cache true)
=======
=======
=======
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4e7b845 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4e0a8d9 (Manifest_cache true)
=======
=======
=======
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b5f64c6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 036bb32 (Manifest_cache true)
=======
=======
=======
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8c7bad7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 3e8974a (Manifest_cache true)
=======
=======
=======
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1bfc7a6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 23e9df9 (Manifest_cache true)
=======
=======
=======
1.46 |
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> da83d1a (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
spec/decorators/book_decorator_spec.rb |
100.00 % |
29 |
13 |
13 |
0 |
<<<<<<< HEAD
1.50 |
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 3b839af (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 9617beb (Manifest_cache true)
=======
=======
=======
1.46 |
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2a431e (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
spec/decorators/book_decorator_spec.rb |
100.00 % |
29 |
13 |
13 |
0 |
<<<<<<< HEAD
1.50 |
>>>>>>> 998f08d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0832698 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b40a04e (Manifest_cache true)
=======
=======
=======
1.46 |
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e733663 (Fix book_spec decrease quantity and price)
=======
=======
1.73 |
>>>>>>> 8f1bc14 (Fix)
<<<<<<< HEAD
>>>>>>> 1ac6be1 (Fix)
=======
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 6fa625b (Manifest_cache true)
1.73 |
<<<<<<< HEAD
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> 1577aeb (Rebased)
=======
=======
=======
1.46 |
>>>>>>> 7375d4b (Manifest_cache true)
=======
=======
>>>>>>> bd8bda4 (Manifest_cache true)
=======
>>>>>>> aa7b40c (Manifest_cache true)
=======
>>>>>>> 183b6c5 (Manifest_cache true)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
spec/decorators/book_decorator_spec.rb |
100.00 % |
29 |
13 |
13 |
0 |
<<<<<<< HEAD
1.50 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b9cc4e9 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 902b803 (Manifest_cache true)
=======
=======
=======
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 6fa625b (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0c9131d (Manifest_cache true)
=======
=======
=======
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> c8cdb08 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b763f5b (Manifest_cache true)
=======
=======
=======
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> be2f578 (Manifest_cache true)
=======
=======
=======
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 24b58e6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> ed97c39 (Manifest_cache true)
=======
=======
=======
1.46 |
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
spec/decorators/book_decorator_spec.rb |
100.00 % |
29 |
13 |
13 |
0 |
<<<<<<< HEAD
1.50 |
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 00f8b58 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 587ce47 (Manifest_cache true)
=======
=======
=======
1.46 |
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
=======
1.73 |
>>>>>>> a5d032d (Fix)
>>>>>>> eaef86a (Fix)
=======
=======
=======
1.46 |
>>>>>>> 7375d4b (Manifest_cache true)
=======
=======
>>>>>>> bd8bda4 (Manifest_cache true)
=======
>>>>>>> aa7b40c (Manifest_cache true)
=======
>>>>>>> 183b6c5 (Manifest_cache true)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
spec/decorators/book_decorator_spec.rb |
100.00 % |
29 |
13 |
13 |
0 |
<<<<<<< HEAD
1.50 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 5518ff0 (Manifest_cache true)
=======
=======
=======
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 75be480 (Manifest_cache true)
=======
=======
=======
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 027f794 (Manifest_cache true)
=======
=======
=======
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e2bfd89 (Manifest_cache true)
=======
=======
=======
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d1bae53 (Manifest_cache true)
=======
=======
=======
1.46 |
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
spec/decorators/book_decorator_spec.rb |
100.00 % |
29 |
13 |
13 |
0 |
<<<<<<< HEAD
1.50 |
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 35d9b13 (Manifest_cache true)
=======
=======
=======
1.46 |
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
spec/decorators/book_decorator_spec.rb |
100.00 % |
29 |
13 |
13 |
0 |
<<<<<<< HEAD
1.50 |
>>>>>>> 998f08d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7f7abc (Manifest_cache true)
=======
=======
=======
1.46 |
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
=======
1.73 |
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1a9aba9 (Fix)
=======
=======
=======
1.46 |
>>>>>>> 7375d4b (Manifest_cache true)
=======
=======
>>>>>>> bd8bda4 (Manifest_cache true)
=======
>>>>>>> aa7b40c (Manifest_cache true)
=======
>>>>>>> 183b6c5 (Manifest_cache true)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
spec/decorators/book_decorator_spec.rb |
100.00 % |
29 |
13 |
13 |
0 |
<<<<<<< HEAD
1.50 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 866aee4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 459d812 (Manifest_cache true)
=======
=======
=======
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4e7b845 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 3fef583 (Manifest_cache true)
=======
=======
=======
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b5f64c6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b746b60 (Manifest_cache true)
=======
=======
=======
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8c7bad7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e965665 (Manifest_cache true)
=======
=======
=======
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1bfc7a6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 10b6c72 (Manifest_cache true)
=======
=======
=======
1.46 |
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
spec/decorators/book_decorator_spec.rb |
100.00 % |
29 |
13 |
13 |
0 |
<<<<<<< HEAD
1.50 |
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 3b839af (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a77cc8a (Manifest_cache true)
=======
=======
=======
1.46 |
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
spec/decorators/book_decorator_spec.rb |
100.00 % |
29 |
13 |
13 |
0 |
<<<<<<< HEAD
1.50 |
>>>>>>> 998f08d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0832698 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 39467b5 (Manifest_cache true)
=======
=======
=======
1.46 |
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
=======
=======
1.73 |
>>>>>>> 8f1bc14 (Fix)
>>>>>>> 49e3b70 (Fix)
=======
=======
=======
1.46 |
>>>>>>> 7375d4b (Manifest_cache true)
=======
=======
>>>>>>> bd8bda4 (Manifest_cache true)
=======
>>>>>>> aa7b40c (Manifest_cache true)
=======
>>>>>>> 183b6c5 (Manifest_cache true)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
spec/decorators/book_decorator_spec.rb |
100.00 % |
29 |
13 |
13 |
0 |
<<<<<<< HEAD
1.50 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e991554 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 6edce20 (Manifest_cache true)
=======
=======
=======
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b8aab1a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 04108c4 (Manifest_cache true)
=======
=======
=======
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 3c386ca (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d8298a1 (Manifest_cache true)
=======
=======
=======
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> fe7e312 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> bdea3aa (Manifest_cache true)
=======
=======
=======
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 94d9078 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 07682bd (Manifest_cache true)
=======
=======
=======
1.46 |
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 7b112c2 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 45f6de0 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
spec/decorators/book_decorator_spec.rb |
100.00 % |
29 |
13 |
13 |
0 |
<<<<<<< HEAD
1.50 |
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2956182 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e2d040a (Manifest_cache true)
=======
=======
=======
1.46 |
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> a455e8a (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 7718476 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
spec/decorators/book_decorator_spec.rb |
100.00 % |
29 |
13 |
13 |
0 |
<<<<<<< HEAD
1.50 |
>>>>>>> 998f08d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 9d9ff14 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 307ac6e (Manifest_cache true)
=======
=======
=======
1.46 |
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 59078f6 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> cea736b (Fix book_spec decrease quantity and price)
=======
=======
1.73 |
>>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
| spec/factories/admin_users.rb |
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 7945032 (Manifest_cache true)
=======
>>>>>>> b00b319 (Manifest_cache true)
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
>>>>>>> b459807 (Manifest_cache true)
=======
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> e9f3851 (Manifest_cache true)
=======
>>>>>>> d782a28 (Manifest_cache true)
=======
>>>>>>> 35d17b9 (Manifest_cache true)
=======
>>>>>>> add330c (Manifest_cache true)
=======
>>>>>>> 15bff2e (Manifest_cache true)
=======
>>>>>>> 6c71f00 (Manifest_cache true)
=======
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
=======
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 9bebee5 (Manifest_cache true)
=======
>>>>>>> 394c6f3 (Manifest_cache true)
=======
>>>>>>> 0b43b18 (Manifest_cache true)
=======
>>>>>>> caaaa41 (Manifest_cache true)
=======
>>>>>>> 8874887 (Manifest_cache true)
=======
>>>>>>> d15fe1d (Fix)
=======
>>>>>>> dcf74e1 (Manifest_cache true)
=======
>>>>>>> 022e63e (Manifest_cache true)
=======
>>>>>>> 10bdfea (Manifest_cache true)
=======
>>>>>>> d70f030 (Manifest_cache true)
=======
>>>>>>> cae047f (Manifest_cache true)
=======
>>>>>>> a9e654b (Manifest_cache true)
=======
>>>>>>> 0b5b269 (Fix)
=======
>>>>>>> ab67c96 (Manifest_cache true)
=======
>>>>>>> 036bb32 (Manifest_cache true)
=======
>>>>>>> 3e8974a (Manifest_cache true)
=======
>>>>>>> 23e9df9 (Manifest_cache true)
=======
>>>>>>> 9617beb (Manifest_cache true)
=======
>>>>>>> b40a04e (Manifest_cache true)
=======
>>>>>>> 1ac6be1 (Fix)
=======
>>>>>>> 3dc272d (Featire specs)
=======
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 902b803 (Manifest_cache true)
=======
>>>>>>> b763f5b (Manifest_cache true)
=======
>>>>>>> be2f578 (Manifest_cache true)
=======
>>>>>>> ed97c39 (Manifest_cache true)
=======
>>>>>>> 587ce47 (Manifest_cache true)
=======
>>>>>>> eaef86a (Fix)
=======
>>>>>>> 5518ff0 (Manifest_cache true)
=======
>>>>>>> 027f794 (Manifest_cache true)
=======
>>>>>>> e2bfd89 (Manifest_cache true)
=======
>>>>>>> d1bae53 (Manifest_cache true)
=======
>>>>>>> 35d9b13 (Manifest_cache true)
=======
>>>>>>> f7f7abc (Manifest_cache true)
=======
>>>>>>> 1a9aba9 (Fix)
=======
>>>>>>> 459d812 (Manifest_cache true)
=======
>>>>>>> b746b60 (Manifest_cache true)
=======
>>>>>>> e965665 (Manifest_cache true)
=======
>>>>>>> 10b6c72 (Manifest_cache true)
=======
>>>>>>> a77cc8a (Manifest_cache true)
=======
>>>>>>> 39467b5 (Manifest_cache true)
=======
>>>>>>> 49e3b70 (Fix)
=======
>>>>>>> 6edce20 (Manifest_cache true)
=======
>>>>>>> d8298a1 (Manifest_cache true)
=======
>>>>>>> bdea3aa (Manifest_cache true)
=======
>>>>>>> 07682bd (Manifest_cache true)
=======
>>>>>>> e2d040a (Manifest_cache true)
=======
>>>>>>> 307ac6e (Manifest_cache true)
=======
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> bd8bda4 (Manifest_cache true)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> aa7b40c (Manifest_cache true)
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
spec/factories/authors.rb |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d96cf3b (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
>>>>>>> c8cdb08 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
>>>>>>> 24b58e6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a5d032d (Fix)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
>>>>>>> 7945032 (Manifest_cache true)
=======
>>>>>>> b00b319 (Manifest_cache true)
=======
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
>>>>>>> 86d584a (Manifest_cache true)
=======
>>>>>>> b459807 (Manifest_cache true)
=======
=======
>>>>>>> 00f8b58 (Manifest_cache true)
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
>>>>>>> 49e8a6c (Rebased)
=======
=======
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 35d17b9 (Manifest_cache true)
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> add330c (Manifest_cache true)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 15bff2e (Manifest_cache true)
=======
=======
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6c71f00 (Manifest_cache true)
=======
=======
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1d59aaa (Fix)
=======
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
>>>>>>> 9bebee5 (Manifest_cache true)
=======
>>>>>>> 394c6f3 (Manifest_cache true)
=======
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
>>>>>>> 0b43b18 (Manifest_cache true)
=======
>>>>>>> caaaa41 (Manifest_cache true)
=======
=======
>>>>>>> 00f8b58 (Manifest_cache true)
>>>>>>> 8874887 (Manifest_cache true)
=======
>>>>>>> 078304c (Rebased)
=======
=======
>>>>>>> a5d032d (Fix)
>>>>>>> d15fe1d (Fix)
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> dcf74e1 (Manifest_cache true)
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
>>>>>>> 022e63e (Manifest_cache true)
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
>>>>>>> 10bdfea (Manifest_cache true)
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
>>>>>>> d70f030 (Manifest_cache true)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
>>>>>>> cae047f (Manifest_cache true)
=======
=======
>>>>>>> b15044a (Manifest_cache true)
>>>>>>> a9e654b (Manifest_cache true)
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 0b5b269 (Fix)
=======
=======
>>>>>>> 866aee4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ab67c96 (Manifest_cache true)
=======
=======
>>>>>>> b5f64c6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 036bb32 (Manifest_cache true)
=======
=======
>>>>>>> 8c7bad7 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3e8974a (Manifest_cache true)
=======
=======
>>>>>>> 1bfc7a6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 23e9df9 (Manifest_cache true)
=======
=======
>>>>>>> 3b839af (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9617beb (Manifest_cache true)
=======
=======
>>>>>>> 0832698 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b40a04e (Manifest_cache true)
=======
=======
>>>>>>> 8f1bc14 (Fix)
<<<<<<< HEAD
>>>>>>> 1ac6be1 (Fix)
=======
=======
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
>>>>>>> 902b803 (Manifest_cache true)
=======
>>>>>>> b763f5b (Manifest_cache true)
=======
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
>>>>>>> be2f578 (Manifest_cache true)
=======
>>>>>>> ed97c39 (Manifest_cache true)
=======
=======
>>>>>>> 00f8b58 (Manifest_cache true)
>>>>>>> 587ce47 (Manifest_cache true)
=======
>>>>>>> bebaea7 (Rebased)
=======
=======
>>>>>>> a5d032d (Fix)
>>>>>>> eaef86a (Fix)
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> 5518ff0 (Manifest_cache true)
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
>>>>>>> 027f794 (Manifest_cache true)
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
>>>>>>> e2bfd89 (Manifest_cache true)
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
>>>>>>> d1bae53 (Manifest_cache true)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
>>>>>>> 35d9b13 (Manifest_cache true)
=======
=======
>>>>>>> b15044a (Manifest_cache true)
>>>>>>> f7f7abc (Manifest_cache true)
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1a9aba9 (Fix)
=======
=======
>>>>>>> 866aee4 (Manifest_cache true)
>>>>>>> 459d812 (Manifest_cache true)
=======
=======
>>>>>>> b5f64c6 (Manifest_cache true)
>>>>>>> b746b60 (Manifest_cache true)
=======
=======
>>>>>>> 8c7bad7 (Manifest_cache true)
>>>>>>> e965665 (Manifest_cache true)
=======
=======
>>>>>>> 1bfc7a6 (Manifest_cache true)
>>>>>>> 10b6c72 (Manifest_cache true)
=======
=======
>>>>>>> 3b839af (Manifest_cache true)
>>>>>>> a77cc8a (Manifest_cache true)
=======
=======
>>>>>>> 0832698 (Manifest_cache true)
>>>>>>> 39467b5 (Manifest_cache true)
=======
=======
>>>>>>> 8f1bc14 (Fix)
>>>>>>> 49e3b70 (Fix)
=======
=======
>>>>>>> e991554 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 6edce20 (Manifest_cache true)
=======
=======
>>>>>>> 3c386ca (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d8298a1 (Manifest_cache true)
=======
=======
>>>>>>> fe7e312 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> bdea3aa (Manifest_cache true)
=======
=======
>>>>>>> 94d9078 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 07682bd (Manifest_cache true)
=======
=======
>>>>>>> 2956182 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e2d040a (Manifest_cache true)
=======
=======
>>>>>>> 9d9ff14 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 307ac6e (Manifest_cache true)
=======
=======
>>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
spec/factories/addresses.rb |
100.00 % |
4 |
2 |
2 |
0 |
1.00 |
| spec/factories/admin_users.rb |
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d780a52 (Rebased)
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 836a973 (Rebased)
=======
spec/factories/authors.rb |
>>>>>>> cde4834 (Manifest_cache true)
=======
>>>>>>> 1577aeb (Rebased)
100.00 % |
6 |
4 |
4 |
0 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
8.00 |
=======
7.00 |
>>>>>>> ee78f39 (Rebased)
=======
1.00 |
>>>>>>> 49e8a6c (Rebased)
=======
8.00 |
>>>>>>> 872e675 (Fix)
=======
7.00 |
>>>>>>> 836a973 (Rebased)
=======
1.00 |
>>>>>>> 078304c (Rebased)
=======
8.00 |
>>>>>>> d15fe1d (Fix)
=======
7.00 |
>>>>>>> 1577aeb (Rebased)
=======
1.00 |
>>>>>>> bebaea7 (Rebased)
=======
8.00 |
>>>>>>> eaef86a (Fix)
| spec/factories/authors.rb |
80.00 % |
18 |
10 |
<<<<<<< HEAD
<<<<<<< HEAD
8 |
2 |
2.50 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
1.00 |
>>>>>>> cde4834 (Manifest_cache true)
=======
>>>>>>> 1577aeb (Rebased)
=======
=======
=======
>>>>>>> 02a399d (Manifest_cache true)
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> bd8bda4 (Manifest_cache true)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> aa7b40c (Manifest_cache true)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 183b6c5 (Manifest_cache true)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd6db03 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b35d1f8 (Featire specs)
=======
=======
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 5518ff0 (Manifest_cache true)
=======
>>>>>>> a1fe6da (Featire specs)
=======
=======
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> 027f794 (Manifest_cache true)
=======
>>>>>>> 28fed3c (Featire specs)
=======
=======
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> e2bfd89 (Manifest_cache true)
=======
>>>>>>> ed6aebd (Featire specs)
=======
=======
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> d1bae53 (Manifest_cache true)
=======
>>>>>>> 64d4167 (Featire specs)
=======
=======
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 35d9b13 (Manifest_cache true)
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 13fd74f (Featire specs)
=======
=======
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> f7f7abc (Manifest_cache true)
=======
=======
>>>>>>> dacfb20 (Featire specs)
=======
=======
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 459d812 (Manifest_cache true)
=======
>>>>>>> 93db8b1 (Featire specs)
=======
=======
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> b746b60 (Manifest_cache true)
=======
>>>>>>> 5f76842 (Featire specs)
=======
=======
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> e965665 (Manifest_cache true)
=======
>>>>>>> ea0650c (Featire specs)
=======
=======
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 10b6c72 (Manifest_cache true)
=======
>>>>>>> a038b16 (Featire specs)
=======
=======
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> a77cc8a (Manifest_cache true)
=======
>>>>>>> 4552227 (Featire specs)
>>>>>>> d7fadcd (Featire specs)
=======
=======
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> 39467b5 (Manifest_cache true)
=======
=======
>>>>>>> 78d0719 (Featire specs)
=======
=======
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 6edce20 (Manifest_cache true)
=======
>>>>>>> f861b82 (Featire specs)
=======
=======
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> d8298a1 (Manifest_cache true)
=======
>>>>>>> 2fd2048 (Featire specs)
=======
=======
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> bdea3aa (Manifest_cache true)
=======
>>>>>>> bc0ff2c (Featire specs)
=======
=======
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 07682bd (Manifest_cache true)
=======
>>>>>>> 9bf2aae (Featire specs)
=======
=======
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> e2d040a (Manifest_cache true)
=======
>>>>>>> 4552227 (Featire specs)
>>>>>>> 5ce1a6d (Featire specs)
=======
=======
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> 307ac6e (Manifest_cache true)
spec/factories/authors.rb |
100.00 % |
6 |
4 |
4 |
0 |
1.00 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8c32a77 (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 56ef3ac (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 113da87 (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8b420cf (Featire specs)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 20256f8 (Featire specs)
=======
7 |
3 |
0.70 |
>>>>>>> bebaea7 (Rebased)
=======
8 |
2 |
2.50 |
>>>>>>> eaef86a (Fix)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> b35d1f8 (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> a1fe6da (Featire specs)
=======
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> d7fadcd (Featire specs)
=======
>>>>>>> bc0ff2c (Featire specs)
=======
>>>>>>> 9bf2aae (Featire specs)
=======
>>>>>>> 5ce1a6d (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 28fed3c (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ed6aebd (Featire specs)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 64d4167 (Featire specs)
=======
=======
>>>>>>> 4552227 (Featire specs)
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> 1a9aba9 (Fix)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> dacfb20 (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 93db8b1 (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 5f76842 (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> ea0650c (Featire specs)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> a038b16 (Featire specs)
=======
=======
>>>>>>> 4552227 (Featire specs)
>>>>>>> d7fadcd (Featire specs)
=======
>>>>>>> 49e3b70 (Fix)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 78d0719 (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> f861b82 (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 2fd2048 (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> bc0ff2c (Featire specs)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9bf2aae (Featire specs)
=======
=======
>>>>>>> 4552227 (Featire specs)
>>>>>>> 5ce1a6d (Featire specs)
=======
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
| spec/factories/authors_books.rb |
100.00 % |
6 |
4 |
4 |
0 |
1.00 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> bebaea7 (Rebased)
=======
>>>>>>> b35d1f8 (Featire specs)
=======
>>>>>>> a1fe6da (Featire specs)
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> 1a9aba9 (Fix)
=======
>>>>>>> dacfb20 (Featire specs)
=======
>>>>>>> 93db8b1 (Featire specs)
=======
>>>>>>> 5f76842 (Featire specs)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> d7fadcd (Featire specs)
=======
>>>>>>> 49e3b70 (Fix)
=======
>>>>>>> 78d0719 (Featire specs)
=======
>>>>>>> f861b82 (Featire specs)
=======
>>>>>>> 2fd2048 (Featire specs)
=======
>>>>>>> bc0ff2c (Featire specs)
=======
>>>>>>> 9bf2aae (Featire specs)
=======
>>>>>>> 5ce1a6d (Featire specs)
=======
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
| spec/factories/billings.rb |
100.00 % |
10 |
8 |
8 |
0 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
1.00 |
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> ee78f39 (Rebased)
<<<<<<< HEAD
=======
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 3dc272d (Featire specs)
=======
>>>>>>> 1577aeb (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
>>>>>>> 5c33a07 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 3dc272d (Featire specs)
=======
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
2.56 |
=======
<<<<<<< HEAD
69.56 |
=======
2.56 |
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
=======
68.00 |
>>>>>>> 752f0c0 (Featire specs)
=======
2.56 |
>>>>>>> bd8bda4 (Manifest_cache true)
=======
68.00 |
>>>>>>> 4e81ea2 (Featire specs)
=======
2.56 |
>>>>>>> aa7b40c (Manifest_cache true)
=======
68.00 |
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> d96cf3b (Featire specs)
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
=======
=======
2.56 |
>>>>>>> 183b6c5 (Manifest_cache true)
=======
69.56 |
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f764a87 (Fix book_spec decrease quantity and price)
=======
=======
1.00 |
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> d780a52 (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
=======
1.00 |
>>>>>>> c033601 (Rebased)
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
=======
1.00 |
>>>>>>> c033601 (Rebased)
>>>>>>> 836a973 (Rebased)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 93db8b1 (Featire specs)
=======
>>>>>>> 5f76842 (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> a038b16 (Featire specs)
=======
=======
>>>>>>> 4552227 (Featire specs)
>>>>>>> d7fadcd (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> f861b82 (Featire specs)
=======
>>>>>>> 2fd2048 (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> bc0ff2c (Featire specs)
=======
>>>>>>> 9bf2aae (Featire specs)
=======
=======
>>>>>>> 4552227 (Featire specs)
>>>>>>> 5ce1a6d (Featire specs)
spec/factories/books.rb |
100.00 % |
11 |
9 |
9 |
0 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
2.56 |
>>>>>>> cde4834 (Manifest_cache true)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 3dc272d (Featire specs)
=======
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
=======
=======
1.00 |
>>>>>>> c033601 (Rebased)
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> bebaea7 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 1577aeb (Rebased)
| spec/factories/books.rb |
80.95 % |
35 |
21 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
17 |
4 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
46.38 |
=======
<<<<<<< HEAD
<<<<<<< HEAD
45.52 |
<<<<<<< HEAD
>>>>>>> ee78f39 (Rebased)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4552227 (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> c006a44 (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> f5da5ac (Featire specs)
=======
>>>>>>> 5f79779 (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 56a05fb (Featire specs)
=======
>>>>>>> 6d21330 (Featire specs)
=======
=======
>>>>>>> 4552227 (Featire specs)
>>>>>>> 27e3351 (Featire specs)
spec/factories/books.rb |
100.00 % |
11 |
9 |
9 |
0 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> 022e63e (Manifest_cache true)
=======
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 10bdfea (Manifest_cache true)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> d70f030 (Manifest_cache true)
=======
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> f5da5ac (Featire specs)
=======
>>>>>>> 036bb32 (Manifest_cache true)
=======
>>>>>>> 5f79779 (Featire specs)
=======
>>>>>>> 3e8974a (Manifest_cache true)
=======
>>>>>>> 56a05fb (Featire specs)
=======
>>>>>>> 23e9df9 (Manifest_cache true)
=======
>>>>>>> da83d1a (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6d21330 (Featire specs)
=======
>>>>>>> 9617beb (Manifest_cache true)
=======
>>>>>>> a2a431e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 27e3351 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 56ef3ac (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> b763f5b (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 113da87 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> be2f578 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 8b420cf (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> ed97c39 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 20256f8 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 587ce47 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 93db8b1 (Featire specs)
=======
>>>>>>> b746b60 (Manifest_cache true)
=======
>>>>>>> 5f76842 (Featire specs)
=======
>>>>>>> e965665 (Manifest_cache true)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> 10b6c72 (Manifest_cache true)
=======
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> a77cc8a (Manifest_cache true)
=======
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d7fadcd (Featire specs)
=======
>>>>>>> f861b82 (Featire specs)
=======
>>>>>>> d8298a1 (Manifest_cache true)
=======
>>>>>>> 2fd2048 (Featire specs)
=======
>>>>>>> bdea3aa (Manifest_cache true)
=======
>>>>>>> bc0ff2c (Featire specs)
=======
>>>>>>> 07682bd (Manifest_cache true)
=======
>>>>>>> 45f6de0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9bf2aae (Featire specs)
=======
>>>>>>> e2d040a (Manifest_cache true)
=======
>>>>>>> 7718476 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5ce1a6d (Featire specs)
68.00 |
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
=======
2.56 |
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 7945032 (Manifest_cache true)
=======
=======
69.56 |
=======
2.56 |
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0bdcc5e (Manifest_cache true)
=======
=======
68.00 |
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 563720e (Featire specs)
=======
=======
2.56 |
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b00b319 (Manifest_cache true)
=======
=======
68.00 |
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a9bf83f (Featire specs)
=======
=======
2.56 |
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 86d584a (Manifest_cache true)
=======
=======
68.00 |
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
=======
2.56 |
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b459807 (Manifest_cache true)
=======
=======
69.56 |
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
68.00 |
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
=======
2.56 |
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
=======
69.56 |
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
15 |
6 |
0.71 |
>>>>>>> 49e8a6c (Rebased)
=======
17 |
4 |
<<<<<<< HEAD
46.38 |
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 872e675 (Fix)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
=======
>>>>>>> b4763a2 (Featire specs)
spec/factories/books.rb |
100.00 % |
11 |
9 |
9 |
0 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
68.00 |
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
=======
2.56 |
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
=======
=======
69.56 |
=======
2.56 |
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
=======
=======
68.00 |
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
2.56 |
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
=======
=======
68.00 |
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
2.56 |
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 35d17b9 (Manifest_cache true)
=======
=======
68.00 |
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
2.56 |
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> add330c (Manifest_cache true)
=======
=======
69.56 |
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
68.00 |
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
2.56 |
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 15bff2e (Manifest_cache true)
=======
=======
69.56 |
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
68.00 |
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
2.56 |
>>>>>>> 998f08d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6c71f00 (Manifest_cache true)
=======
=======
69.56 |
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
49.62 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1d59aaa (Fix)
=======
17 |
4 |
45.52 |
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 836a973 (Rebased)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> 4552227 (Featire specs)
=======
=======
>>>>>>> d6f7da8 (Featire specs)
=======
=======
>>>>>>> 8c32a77 (Featire specs)
=======
=======
>>>>>>> dacfb20 (Featire specs)
=======
=======
>>>>>>> 78d0719 (Featire specs)
spec/factories/books.rb |
100.00 % |
11 |
9 |
9 |
0 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> cae047f (Manifest_cache true)
=======
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> a9e654b (Manifest_cache true)
=======
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
68.00 |
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 2a25e4c (Featire specs)
=======
=======
2.56 |
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 9bebee5 (Manifest_cache true)
=======
=======
69.56 |
=======
2.56 |
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> ee5935f (Manifest_cache true)
=======
=======
68.00 |
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 3e9f99d (Featire specs)
=======
=======
2.56 |
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 394c6f3 (Manifest_cache true)
=======
=======
68.00 |
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5be567f (Featire specs)
=======
=======
2.56 |
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0b43b18 (Manifest_cache true)
=======
=======
68.00 |
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 2ee03d3 (Featire specs)
=======
=======
2.56 |
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> caaaa41 (Manifest_cache true)
=======
=======
69.56 |
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
=======
68.00 |
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5506bd0 (Featire specs)
=======
=======
2.56 |
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8874887 (Manifest_cache true)
=======
=======
69.56 |
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
15 |
6 |
0.71 |
>>>>>>> 078304c (Rebased)
=======
17 |
4 |
<<<<<<< HEAD
46.38 |
<<<<<<< HEAD
>>>>>>> d15fe1d (Fix)
=======
68.00 |
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> b4763a2 (Featire specs)
=======
=======
>>>>>>> d66884b (Manifest_cache true)
=======
>>>>>>> 4e0a8d9 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 0c9131d (Manifest_cache true)
=======
>>>>>>> 3fef583 (Manifest_cache true)
=======
>>>>>>> 04108c4 (Manifest_cache true)
68.00 |
>>>>>>> d0dc1f1 (Featire specs)
=======
2.56 |
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> dcf74e1 (Manifest_cache true)
=======
=======
>>>>>>> 4e0a8d9 (Manifest_cache true)
=======
>>>>>>> 0c9131d (Manifest_cache true)
=======
>>>>>>> 3fef583 (Manifest_cache true)
=======
>>>>>>> 04108c4 (Manifest_cache true)
=======
69.56 |
=======
2.56 |
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d66884b (Manifest_cache true)
=======
=======
68.00 |
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> bcd09ab (Featire specs)
=======
=======
2.56 |
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> 022e63e (Manifest_cache true)
=======
=======
68.00 |
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c006a44 (Featire specs)
=======
=======
2.56 |
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 10bdfea (Manifest_cache true)
=======
=======
68.00 |
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 848bfa2 (Featire specs)
=======
=======
2.56 |
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> d70f030 (Manifest_cache true)
=======
=======
69.56 |
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
=======
68.00 |
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9ca3b84 (Featire specs)
=======
=======
2.56 |
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> cae047f (Manifest_cache true)
=======
=======
69.56 |
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
=======
68.00 |
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> fefbd35 (Featire specs)
=======
=======
2.56 |
>>>>>>> 998f08d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a9e654b (Manifest_cache true)
=======
=======
69.56 |
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
49.62 |
>>>>>>> 0b5b269 (Fix)
=======
68.00 |
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> d6f7da8 (Featire specs)
=======
68.00 |
>>>>>>> d0dc1f1 (Featire specs)
=======
2.56 |
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> ab67c96 (Manifest_cache true)
=======
>>>>>>> 4e0a8d9 (Manifest_cache true)
=======
=======
68.00 |
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> f5da5ac (Featire specs)
=======
=======
2.56 |
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> 036bb32 (Manifest_cache true)
=======
=======
68.00 |
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 5f79779 (Featire specs)
=======
=======
2.56 |
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 3e8974a (Manifest_cache true)
=======
=======
68.00 |
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 56a05fb (Featire specs)
=======
=======
2.56 |
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 23e9df9 (Manifest_cache true)
=======
=======
69.56 |
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> da83d1a (Fix book_spec decrease quantity and price)
=======
=======
68.00 |
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 6d21330 (Featire specs)
=======
=======
2.56 |
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 9617beb (Manifest_cache true)
=======
=======
69.56 |
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> a2a431e (Fix book_spec decrease quantity and price)
=======
=======
68.00 |
>>>>>>> 4552227 (Featire specs)
>>>>>>> 27e3351 (Featire specs)
=======
=======
2.56 |
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b40a04e (Manifest_cache true)
=======
=======
69.56 |
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> e733663 (Fix book_spec decrease quantity and price)
=======
49.62 |
>>>>>>> 1ac6be1 (Fix)
=======
17 |
4 |
45.52 |
>>>>>>> 1577aeb (Rebased)
=======
68.00 |
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 8c32a77 (Featire specs)
=======
<<<<<<< HEAD
68.00 |
>>>>>>> d0dc1f1 (Featire specs)
=======
2.56 |
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 902b803 (Manifest_cache true)
=======
>>>>>>> 0c9131d (Manifest_cache true)
=======
=======
68.00 |
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 56ef3ac (Featire specs)
=======
=======
2.56 |
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> b763f5b (Manifest_cache true)
=======
=======
68.00 |
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 113da87 (Featire specs)
=======
=======
2.56 |
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> be2f578 (Manifest_cache true)
=======
=======
68.00 |
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 8b420cf (Featire specs)
=======
=======
2.56 |
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> ed97c39 (Manifest_cache true)
=======
=======
69.56 |
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
68.00 |
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 20256f8 (Featire specs)
=======
=======
2.56 |
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 587ce47 (Manifest_cache true)
=======
=======
69.56 |
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
spec/factories/books.rb |
80.95 % |
35 |
21 |
<<<<<<< HEAD
15 |
6 |
0.71 |
>>>>>>> bebaea7 (Rebased)
=======
17 |
4 |
46.38 |
>>>>>>> eaef86a (Fix)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> 4552227 (Featire specs)
spec/factories/books.rb |
100.00 % |
11 |
9 |
9 |
0 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 39467b5 (Manifest_cache true)
=======
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 307ac6e (Manifest_cache true)
=======
>>>>>>> cea736b (Fix book_spec decrease quantity and price)
68.00 |
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> b35d1f8 (Featire specs)
=======
=======
2.56 |
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 5518ff0 (Manifest_cache true)
=======
=======
69.56 |
=======
2.56 |
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 75be480 (Manifest_cache true)
=======
=======
68.00 |
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> a1fe6da (Featire specs)
=======
=======
2.56 |
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 027f794 (Manifest_cache true)
=======
=======
68.00 |
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 28fed3c (Featire specs)
=======
=======
2.56 |
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e2bfd89 (Manifest_cache true)
=======
=======
68.00 |
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ed6aebd (Featire specs)
=======
=======
2.56 |
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d1bae53 (Manifest_cache true)
=======
=======
69.56 |
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
=======
68.00 |
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 64d4167 (Featire specs)
=======
=======
2.56 |
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 35d9b13 (Manifest_cache true)
=======
=======
69.56 |
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
=======
68.00 |
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 13fd74f (Featire specs)
=======
=======
2.56 |
>>>>>>> 998f08d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f7f7abc (Manifest_cache true)
=======
=======
69.56 |
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
49.62 |
>>>>>>> 1a9aba9 (Fix)
=======
68.00 |
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> dacfb20 (Featire specs)
=======
68.00 |
>>>>>>> d0dc1f1 (Featire specs)
=======
2.56 |
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 459d812 (Manifest_cache true)
=======
>>>>>>> 3fef583 (Manifest_cache true)
=======
=======
68.00 |
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 93db8b1 (Featire specs)
=======
=======
2.56 |
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> b746b60 (Manifest_cache true)
=======
=======
68.00 |
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 5f76842 (Featire specs)
=======
=======
2.56 |
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> e965665 (Manifest_cache true)
=======
=======
68.00 |
>>>>>>> 08edf50 (Featire specs)
>>>>>>> ea0650c (Featire specs)
=======
=======
2.56 |
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 10b6c72 (Manifest_cache true)
=======
=======
69.56 |
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
=======
=======
68.00 |
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> a038b16 (Featire specs)
=======
=======
2.56 |
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> a77cc8a (Manifest_cache true)
=======
=======
69.56 |
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
=======
=======
68.00 |
>>>>>>> 4552227 (Featire specs)
>>>>>>> d7fadcd (Featire specs)
=======
=======
2.56 |
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> 39467b5 (Manifest_cache true)
=======
=======
69.56 |
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 49e3b70 (Fix)
=======
68.00 |
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 78d0719 (Featire specs)
=======
68.00 |
>>>>>>> d0dc1f1 (Featire specs)
=======
2.56 |
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 6edce20 (Manifest_cache true)
=======
>>>>>>> 04108c4 (Manifest_cache true)
=======
=======
68.00 |
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> f861b82 (Featire specs)
=======
=======
2.56 |
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> d8298a1 (Manifest_cache true)
=======
=======
68.00 |
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 2fd2048 (Featire specs)
=======
=======
2.56 |
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> bdea3aa (Manifest_cache true)
=======
=======
68.00 |
>>>>>>> 08edf50 (Featire specs)
>>>>>>> bc0ff2c (Featire specs)
=======
=======
2.56 |
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 07682bd (Manifest_cache true)
=======
=======
69.56 |
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 45f6de0 (Fix book_spec decrease quantity and price)
=======
=======
68.00 |
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9bf2aae (Featire specs)
=======
=======
2.56 |
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> e2d040a (Manifest_cache true)
=======
=======
69.56 |
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 7718476 (Fix book_spec decrease quantity and price)
=======
=======
68.00 |
>>>>>>> 4552227 (Featire specs)
>>>>>>> 5ce1a6d (Featire specs)
=======
=======
2.56 |
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> 307ac6e (Manifest_cache true)
=======
=======
69.56 |
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> cea736b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
| spec/factories/books_categories.rb |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
spec/factories/books_category.rb |
>>>>>>> cde4834 (Manifest_cache true)
=======
>>>>>>> 1577aeb (Rebased)
=======
=======
spec/factories/books_category.rb |
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8c32a77 (Featire specs)
=======
=======
spec/factories/books_category.rb |
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 56ef3ac (Featire specs)
=======
=======
spec/factories/books_category.rb |
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 113da87 (Featire specs)
=======
=======
spec/factories/books_category.rb |
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8b420cf (Featire specs)
=======
=======
spec/factories/books_category.rb |
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> bebaea7 (Rebased)
=======
=======
spec/factories/books_category.rb |
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> b35d1f8 (Featire specs)
=======
=======
spec/factories/books_category.rb |
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> a1fe6da (Featire specs)
=======
=======
spec/factories/books_category.rb |
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 28fed3c (Featire specs)
=======
=======
spec/factories/books_category.rb |
>>>>>>> 08edf50 (Featire specs)
>>>>>>> ed6aebd (Featire specs)
=======
=======
spec/factories/books_category.rb |
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 64d4167 (Featire specs)
=======
=======
spec/factories/books_category.rb |
>>>>>>> 4552227 (Featire specs)
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> 1a9aba9 (Fix)
=======
=======
spec/factories/books_category.rb |
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> dacfb20 (Featire specs)
=======
=======
spec/factories/books_category.rb |
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 93db8b1 (Featire specs)
=======
=======
spec/factories/books_category.rb |
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 5f76842 (Featire specs)
=======
=======
spec/factories/books_category.rb |
>>>>>>> 08edf50 (Featire specs)
>>>>>>> ea0650c (Featire specs)
=======
=======
spec/factories/books_category.rb |
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> a038b16 (Featire specs)
=======
=======
spec/factories/books_category.rb |
>>>>>>> 4552227 (Featire specs)
>>>>>>> d7fadcd (Featire specs)
=======
>>>>>>> 49e3b70 (Fix)
=======
=======
spec/factories/books_category.rb |
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 78d0719 (Featire specs)
=======
=======
spec/factories/books_category.rb |
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> f861b82 (Featire specs)
=======
=======
spec/factories/books_category.rb |
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 2fd2048 (Featire specs)
=======
=======
spec/factories/books_category.rb |
>>>>>>> 08edf50 (Featire specs)
>>>>>>> bc0ff2c (Featire specs)
=======
=======
spec/factories/books_category.rb |
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9bf2aae (Featire specs)
=======
=======
spec/factories/books_category.rb |
>>>>>>> 4552227 (Featire specs)
>>>>>>> 5ce1a6d (Featire specs)
=======
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
100.00 % |
6 |
4 |
4 |
0 |
1.00 |
| spec/factories/categories.rb |
100.00 % |
5 |
3 |
3 |
0 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
4.67 |
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 7945032 (Manifest_cache true)
=======
>>>>>>> 0bdcc5e (Manifest_cache true)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> b00b319 (Manifest_cache true)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> b459807 (Manifest_cache true)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> e9f3851 (Manifest_cache true)
=======
>>>>>>> 307f31f (Manifest_cache true)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> d782a28 (Manifest_cache true)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 35d17b9 (Manifest_cache true)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> add330c (Manifest_cache true)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 15bff2e (Manifest_cache true)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> 6c71f00 (Manifest_cache true)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
=======
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 9bebee5 (Manifest_cache true)
=======
>>>>>>> ee5935f (Manifest_cache true)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 394c6f3 (Manifest_cache true)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 0b43b18 (Manifest_cache true)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> caaaa41 (Manifest_cache true)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> 8874887 (Manifest_cache true)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 078304c (Rebased)
=======
>>>>>>> d15fe1d (Fix)
=======
>>>>>>> b4763a2 (Featire specs)
=======
>>>>>>> dcf74e1 (Manifest_cache true)
=======
>>>>>>> d66884b (Manifest_cache true)
=======
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> 022e63e (Manifest_cache true)
=======
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 10bdfea (Manifest_cache true)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> d70f030 (Manifest_cache true)
=======
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> cae047f (Manifest_cache true)
=======
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> a9e654b (Manifest_cache true)
=======
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0b5b269 (Fix)
=======
>>>>>>> d6f7da8 (Featire specs)
=======
>>>>>>> ab67c96 (Manifest_cache true)
=======
>>>>>>> 4e0a8d9 (Manifest_cache true)
=======
>>>>>>> f5da5ac (Featire specs)
=======
>>>>>>> 036bb32 (Manifest_cache true)
=======
>>>>>>> 5f79779 (Featire specs)
=======
>>>>>>> 3e8974a (Manifest_cache true)
=======
>>>>>>> 56a05fb (Featire specs)
=======
>>>>>>> 23e9df9 (Manifest_cache true)
=======
>>>>>>> da83d1a (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6d21330 (Featire specs)
=======
>>>>>>> 9617beb (Manifest_cache true)
=======
>>>>>>> a2a431e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 27e3351 (Featire specs)
=======
>>>>>>> b40a04e (Manifest_cache true)
=======
>>>>>>> e733663 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1ac6be1 (Fix)
=======
>>>>>>> 3dc272d (Featire specs)
=======
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 902b803 (Manifest_cache true)
=======
>>>>>>> 0c9131d (Manifest_cache true)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> b763f5b (Manifest_cache true)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> be2f578 (Manifest_cache true)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> ed97c39 (Manifest_cache true)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 587ce47 (Manifest_cache true)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
>>>>>>> bebaea7 (Rebased)
=======
>>>>>>> eaef86a (Fix)
=======
>>>>>>> b35d1f8 (Featire specs)
=======
>>>>>>> 5518ff0 (Manifest_cache true)
=======
>>>>>>> 75be480 (Manifest_cache true)
=======
>>>>>>> a1fe6da (Featire specs)
=======
>>>>>>> 027f794 (Manifest_cache true)
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> e2bfd89 (Manifest_cache true)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> d1bae53 (Manifest_cache true)
=======
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> 35d9b13 (Manifest_cache true)
=======
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> f7f7abc (Manifest_cache true)
=======
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1a9aba9 (Fix)
=======
>>>>>>> dacfb20 (Featire specs)
=======
>>>>>>> 459d812 (Manifest_cache true)
=======
>>>>>>> 3fef583 (Manifest_cache true)
=======
>>>>>>> 93db8b1 (Featire specs)
=======
>>>>>>> b746b60 (Manifest_cache true)
=======
>>>>>>> 5f76842 (Featire specs)
=======
>>>>>>> e965665 (Manifest_cache true)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> 10b6c72 (Manifest_cache true)
=======
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> a77cc8a (Manifest_cache true)
=======
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d7fadcd (Featire specs)
=======
>>>>>>> 39467b5 (Manifest_cache true)
=======
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 49e3b70 (Fix)
=======
>>>>>>> 78d0719 (Featire specs)
=======
>>>>>>> 6edce20 (Manifest_cache true)
=======
>>>>>>> 04108c4 (Manifest_cache true)
=======
>>>>>>> f861b82 (Featire specs)
=======
>>>>>>> d8298a1 (Manifest_cache true)
=======
>>>>>>> 2fd2048 (Featire specs)
=======
>>>>>>> bdea3aa (Manifest_cache true)
=======
>>>>>>> bc0ff2c (Featire specs)
=======
>>>>>>> 07682bd (Manifest_cache true)
=======
>>>>>>> 45f6de0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9bf2aae (Featire specs)
=======
>>>>>>> e2d040a (Manifest_cache true)
=======
>>>>>>> 7718476 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5ce1a6d (Featire specs)
=======
>>>>>>> 307ac6e (Manifest_cache true)
=======
>>>>>>> cea736b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
1.00 |
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3dc272d (Featire specs)
=======
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
1.00 |
=======
<<<<<<< HEAD
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
>>>>>>> 5c33a07 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 3dc272d (Featire specs)
=======
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
3.33 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d96cf3b (Featire specs)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
>>>>>>> 6fa625b (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> c8cdb08 (Manifest_cache true)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 9dc109d (Featire specs)
=======
>>>>>>> 866aee4 (Manifest_cache true)
=======
>>>>>>> 4e7b845 (Manifest_cache true)
=======
>>>>>>> 864f339 (Featire specs)
=======
>>>>>>> b5f64c6 (Manifest_cache true)
=======
>>>>>>> a2de409 (Featire specs)
=======
>>>>>>> 8c7bad7 (Manifest_cache true)
=======
>>>>>>> e54ceb0 (Featire specs)
=======
>>>>>>> 1bfc7a6 (Manifest_cache true)
=======
>>>>>>> 65f3409 (Featire specs)
=======
>>>>>>> e991554 (Manifest_cache true)
=======
>>>>>>> b8aab1a (Manifest_cache true)
=======
>>>>>>> c1749d5 (Featire specs)
=======
>>>>>>> 3c386ca (Manifest_cache true)
=======
>>>>>>> 1cb2e82 (Featire specs)
=======
>>>>>>> fe7e312 (Manifest_cache true)
=======
>>>>>>> 8577deb (Featire specs)
=======
>>>>>>> 94d9078 (Manifest_cache true)
4.67 |
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d780a52 (Rebased)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> 00f8b58 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 15bff2e (Manifest_cache true)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 6c71f00 (Manifest_cache true)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
4.67 |
=======
3.33 |
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a9e66e9 (Featire specs)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c54769d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
=======
=======
3.33 |
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 1677b1a (Featire specs)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
3.33 |
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c346782 (Fix book_spec decrease quantity and price)
=======
=======
1.00 |
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d52ad35 (Rebased)
=======
=======
4.67 |
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
>>>>>>> 6fa625b (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> c8cdb08 (Manifest_cache true)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 9dc109d (Featire specs)
=======
>>>>>>> 866aee4 (Manifest_cache true)
=======
>>>>>>> 4e7b845 (Manifest_cache true)
=======
>>>>>>> 864f339 (Featire specs)
=======
>>>>>>> b5f64c6 (Manifest_cache true)
=======
>>>>>>> a2de409 (Featire specs)
=======
>>>>>>> 8c7bad7 (Manifest_cache true)
=======
>>>>>>> e54ceb0 (Featire specs)
=======
>>>>>>> 1bfc7a6 (Manifest_cache true)
4.67 |
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
1.00 |
>>>>>>> bf554f4 (Rebased)
>>>>>>> 49e8a6c (Rebased)
=======
=======
4.67 |
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> b15044a (Manifest_cache true)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
>>>>>>> 3b839af (Manifest_cache true)
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5a0bcc7 (Featire specs)
=======
>>>>>>> 0832698 (Manifest_cache true)
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
=======
>>>>>>> ebe5361 (Featire specs)
=======
>>>>>>> 2956182 (Manifest_cache true)
=======
>>>>>>> a455e8a (Fix book_spec decrease quantity and price)
=======
>>>>>>> d3d58e0 (Featire specs)
=======
>>>>>>> 9d9ff14 (Manifest_cache true)
=======
>>>>>>> 59078f6 (Fix book_spec decrease quantity and price)
4.67 |
=======
3.33 |
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
=======
3.33 |
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
=======
3.33 |
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
=======
3.33 |
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
=======
3.33 |
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
=======
4.67 |
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
>>>>>>> 6fa625b (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> c8cdb08 (Manifest_cache true)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
4.67 |
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> 6d21330 (Featire specs)
=======
>>>>>>> 9bf2aae (Featire specs)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
3.33 |
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5506bd0 (Featire specs)
=======
=======
=======
3.33 |
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
=======
1.00 |
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
>>>>>>> 078304c (Rebased)
=======
=======
4.67 |
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> d15fe1d (Fix)
=======
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> b15044a (Manifest_cache true)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
>>>>>>> 3b839af (Manifest_cache true)
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5a0bcc7 (Featire specs)
=======
>>>>>>> 0832698 (Manifest_cache true)
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
4.67 |
=======
3.33 |
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
=======
=======
3.33 |
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9ca3b84 (Featire specs)
=======
=======
=======
3.33 |
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
=======
=======
3.33 |
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> fefbd35 (Featire specs)
=======
=======
=======
3.33 |
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
=======
4.67 |
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
>>>>>>> 0b5b269 (Fix)
=======
=======
4.67 |
=======
3.33 |
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> da83d1a (Fix book_spec decrease quantity and price)
=======
=======
=======
3.33 |
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6d21330 (Featire specs)
=======
=======
=======
3.33 |
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2a431e (Fix book_spec decrease quantity and price)
=======
=======
=======
3.33 |
>>>>>>> 4552227 (Featire specs)
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 27e3351 (Featire specs)
=======
=======
=======
3.33 |
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e733663 (Fix book_spec decrease quantity and price)
=======
=======
4.67 |
>>>>>>> 8f1bc14 (Fix)
<<<<<<< HEAD
>>>>>>> 1ac6be1 (Fix)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
>>>>>>> 6fa625b (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> c8cdb08 (Manifest_cache true)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 24b58e6 (Manifest_cache true)
4.67 |
>>>>>>> c033601 (Rebased)
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> a038b16 (Featire specs)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
3.33 |
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 20256f8 (Featire specs)
=======
=======
=======
3.33 |
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
=======
1.00 |
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
>>>>>>> bebaea7 (Rebased)
=======
=======
4.67 |
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> eaef86a (Fix)
=======
=======
>>>>>>> 45f6de0 (Fix book_spec decrease quantity and price)
=======
4.67 |
=======
3.33 |
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
=======
=======
3.33 |
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> 64d4167 (Featire specs)
=======
=======
=======
3.33 |
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
=======
=======
3.33 |
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 13fd74f (Featire specs)
=======
=======
=======
3.33 |
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
=======
4.67 |
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
>>>>>>> 1a9aba9 (Fix)
=======
=======
4.67 |
=======
3.33 |
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
=======
=======
=======
3.33 |
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
>>>>>>> a038b16 (Featire specs)
=======
=======
=======
3.33 |
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
=======
=======
=======
3.33 |
>>>>>>> 4552227 (Featire specs)
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
>>>>>>> d7fadcd (Featire specs)
=======
=======
=======
3.33 |
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
=======
=======
4.67 |
>>>>>>> 8f1bc14 (Fix)
>>>>>>> 49e3b70 (Fix)
=======
>>>>>>> 7b112c2 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 45f6de0 (Fix book_spec decrease quantity and price)
=======
=======
=======
3.33 |
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> ebe5361 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9bf2aae (Featire specs)
=======
=======
=======
3.33 |
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> a455e8a (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 7718476 (Fix book_spec decrease quantity and price)
=======
=======
=======
3.33 |
>>>>>>> 4552227 (Featire specs)
>>>>>>> d3d58e0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5ce1a6d (Featire specs)
=======
=======
=======
3.33 |
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 59078f6 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> cea736b (Fix book_spec decrease quantity and price)
=======
=======
4.67 |
>>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
| spec/factories/users.rb |
=======
spec/factories/reviews.rb |
>>>>>>> aca90e3 (Rebased)
=======
=======
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 27ceb6f (Add login registration pages)
=======
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 65459e8 (Add login registration pages)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
>>>>>>> cb955a0 (Add login registration pages)
=======
>>>>>>> bebaea7 (Rebased)
=======
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
>>>>>>> b5affcb (Add login registration pages)
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4f7c979 (Add login registration pages)
=======
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
>>>>>>> 60943cc (Add login registration pages)
=======
>>>>>>> 1a9aba9 (Fix)
=======
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
=======
>>>>>>> b26425c (Add login registration pages)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 845289f (Add login registration pages)
=======
>>>>>>> d7fadcd (Featire specs)
=======
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 569a007 (Add login registration pages)
=======
>>>>>>> 49e3b70 (Fix)
=======
>>>>>>> 45f6de0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 055b00f (Add login registration pages)
=======
>>>>>>> 9bf2aae (Featire specs)
=======
>>>>>>> 7718476 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e7ec208 (Add login registration pages)
=======
>>>>>>> 5ce1a6d (Featire specs)
=======
>>>>>>> cea736b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 61908af (Add login registration pages)
=======
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
=======
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 22ee41c (Add login registration pages)
spec/factories/users.rb |
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
>>>>>>> cacbab9 (Add login registration pages)
=======
>>>>>>> bf554f4 (Rebased)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a624084 (Add login registration pages)
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6a9fede (Add login registration pages)
=======
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 58d403b (Add login registration pages)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
=======
>>>>>>> b575a28 (Add login registration pages)
=======
>>>>>>> 5a0bcc7 (Featire specs)
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5caffae (Add login registration pages)
=======
>>>>>>> 8f1bc14 (Fix)
=======
>>>>>>> 7b112c2 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 69eb97e (Add login registration pages)
=======
>>>>>>> ebe5361 (Featire specs)
=======
>>>>>>> a455e8a (Fix book_spec decrease quantity and price)
=======
>>>>>>> 089f8cf (Add login registration pages)
=======
>>>>>>> d3d58e0 (Featire specs)
=======
>>>>>>> 59078f6 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0edd9b7 (Add login registration pages)
=======
>>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
spec/factories/coupons.rb |
100.00 % |
8 |
6 |
6 |
0 |
2.50 |
| spec/factories/credit_cards.rb |
100.00 % |
9 |
7 |
7 |
0 |
1.00 |
| spec/factories/deliveries.rb |
100.00 % |
7 |
5 |
5 |
0 |
3.40 |
| spec/factories/order_books.rb |
100.00 % |
7 |
5 |
5 |
0 |
1.80 |
| spec/factories/orders.rb |
80.00 % |
18 |
10 |
8 |
2 |
1.50 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 7c4ea7f (Fix)
=======
<<<<<<< HEAD
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 95ebdc2 (Featire specs)
=======
>>>>>>> 8f1bc14 (Fix)
=======
>>>>>>> 7b112c2 (Fix book_spec decrease quantity and price)
=======
>>>>>>> ebe5361 (Featire specs)
=======
>>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
| spec/factories/reviews.rb |
>>>>>>> c033601 (Rebased)
100.00 % |
7 |
5 |
5 |
0 |
1.00 |
<<<<<<< HEAD
| spec/models/book_spec.rb |
100.00 % |
23 |
16 |
16 |
0 |
1.69 |
| spec/models/books_category_spec.rb |
100.00 % |
15 |
9 |
9 |
0 |
1.44 |
| spec/models/category_spec.rb |
100.00 % |
14 |
8 |
8 |
0 |
1.38 |
<<<<<<< HEAD
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
1.00 |
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 22ee41c (Add login registration pages)
=======
=======
>>>>>>> 58d403b (Add login registration pages)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
>>>>>>> 8f1bc14 (Fix)
| spec/factories/shippings.rb |
100.00 % |
10 |
8 |
8 |
0 |
1.00 |
| spec/factories/users.rb |
100.00 % |
7 |
5 |
5 |
0 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a5d032d (Fix)
11.00 |
=======
13.40 |
>>>>>>> 7c4ea7f (Fix)
=======
15.20 |
>>>>>>> 8f1bc14 (Fix)
| spec/feature/admin/author_spec.rb |
100.00 % |
57 |
31 |
31 |
0 |
1.48 |
| spec/feature/admin/book_spec.rb |
100.00 % |
<<<<<<< HEAD
61 |
32 |
32 |
0 |
1.41 |
=======
83 |
43 |
43 |
0 |
1.56 |
>>>>>>> a5d032d (Fix)
| spec/feature/admin/category_spec.rb |
100.00 % |
48 |
25 |
25 |
0 |
1.56 |
| spec/feature/billing_spec.rb |
73.08 % |
42 |
26 |
19 |
7 |
0.77 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 7375d4b (Manifest_cache true)
3.33 |
>>>>>>> d0dc1f1 (Featire specs)
=======
3.33 |
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
3.33 |
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> a5d032d (Fix)
=======
=======
=======
>>>>>>> 7375d4b (Manifest_cache true)
3.33 |
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
=======
3.33 |
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
=======
=======
=======
>>>>>>> 7375d4b (Manifest_cache true)
3.33 |
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9dc109d (Featire specs)
=======
>>>>>>> 864f339 (Featire specs)
=======
=======
3.33 |
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> a2de409 (Featire specs)
=======
=======
=======
>>>>>>> 7375d4b (Manifest_cache true)
3.33 |
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 65f3409 (Featire specs)
=======
>>>>>>> c1749d5 (Featire specs)
=======
=======
3.33 |
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 1cb2e82 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c033601 (Rebased)
=======
=======
>>>>>>> f182ac7 (Add login registration pages)
=======
>>>>>>> 0005d4a (Add login registration pages)
=======
>>>>>>> fb10fe4 (Add login registration pages)
| spec/factories/users.rb |
100.00 % |
4 |
2 |
2 |
0 |
1.00 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
3.33 |
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> f182ac7 (Add login registration pages)
=======
=======
3.33 |
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 7c4ea7f (Fix)
=======
>>>>>>> 0005d4a (Add login registration pages)
=======
=======
3.33 |
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54ceb0 (Featire specs)
=======
>>>>>>> 8f1bc14 (Fix)
=======
>>>>>>> fb10fe4 (Add login registration pages)
=======
=======
3.33 |
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 8577deb (Featire specs)
=======
>>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9ec6862 (Add login registration pages)
=======
>>>>>>> f182ac7 (Add login registration pages)
=======
>>>>>>> 0005d4a (Add login registration pages)
=======
>>>>>>> fb10fe4 (Add login registration pages)
| spec/feature/book_spec.rb |
>>>>>>> 3dc272d (Featire specs)
100.00 % |
<<<<<<< HEAD
7 |
5 |
5 |
=======
=======
>>>>>>> f764a87 (Fix book_spec decrease quantity and price)
=======
>>>>>>> b6a32ab (Add login registration pages)
=======
>>>>>>> d780a52 (Rebased)
=======
>>>>>>> c54769d (Fix book_spec decrease quantity and price)
=======
>>>>>>> a1a8477 (Add login registration pages)
=======
>>>>>>> 1677b1a (Featire specs)
=======
>>>>>>> c346782 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 551615f (Add login registration pages)
=======
>>>>>>> d52ad35 (Rebased)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> 551f3c1 (Add login registration pages)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> ccec311 (Add login registration pages)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8c3e531 (Add login registration pages)
=======
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> da83d1a (Fix book_spec decrease quantity and price)
=======
>>>>>>> db0e854 (Add login registration pages)
=======
>>>>>>> 6d21330 (Featire specs)
=======
>>>>>>> a2a431e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2cdd6f4 (Add login registration pages)
=======
>>>>>>> 27e3351 (Featire specs)
=======
>>>>>>> e733663 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3a43955 (Add login registration pages)
=======
>>>>>>> 1ac6be1 (Fix)
=======
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 22ee41c (Add login registration pages)
spec/factories/users.rb |
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
>>>>>>> cacbab9 (Add login registration pages)
=======
>>>>>>> bf554f4 (Rebased)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a624084 (Add login registration pages)
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6a9fede (Add login registration pages)
=======
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 58d403b (Add login registration pages)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
=======
>>>>>>> b575a28 (Add login registration pages)
=======
>>>>>>> 5a0bcc7 (Featire specs)
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5caffae (Add login registration pages)
=======
>>>>>>> 8f1bc14 (Fix)
spec/factories/coupons.rb |
100.00 % |
8 |
6 |
6 |
0 |
2.50 |
=======
202 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
spec/feature/book_spec.rb |
100.00 % |
202 |
>>>>>>> a5d032d (Fix)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 7c4ea7f (Fix)
=======
>>>>>>> 9dc109d (Featire specs)
=======
>>>>>>> 864f339 (Featire specs)
=======
>>>>>>> a2de409 (Featire specs)
=======
>>>>>>> e54ceb0 (Featire specs)
=======
>>>>>>> 8f1bc14 (Fix)
=======
>>>>>>> 65f3409 (Featire specs)
=======
>>>>>>> c1749d5 (Featire specs)
=======
>>>>>>> 1cb2e82 (Featire specs)
=======
>>>>>>> 8577deb (Featire specs)
=======
>>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
104 |
104 |
0 |
2.38 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1577aeb (Rebased)
=======
=======
>>>>>>> eaef86a (Fix)
=======
>>>>>>> b35d1f8 (Featire specs)
=======
>>>>>>> 1a9aba9 (Fix)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
=======
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
105 |
105 |
0 |
2.37 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8c32a77 (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 56ef3ac (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 113da87 (Featire specs)
=======
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8b420cf (Featire specs)
=======
=======
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> eaef86a (Fix)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> b35d1f8 (Featire specs)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> a1fe6da (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 28fed3c (Featire specs)
=======
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ed6aebd (Featire specs)
=======
=======
| spec/feature/cart_spec.rb |
100.00 % |
50 |
26 |
26 |
0 |
1.62 |
| spec/feature/checkout_spec.rb |
100.00 % |
59 |
34 |
34 |
0 |
1.26 |
| spec/feature/coupon_spec.rb |
100.00 % |
47 |
28 |
28 |
0 |
<<<<<<< HEAD
2.17 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
>>>>>>> 1a9aba9 (Fix)
=======
=======
=======
<<<<<<< HEAD
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 08edf50 (Featire specs)
=======
=======
>>>>>>> 65f3409 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> c1749d5 (Featire specs)
=======
>>>>>>> 1cb2e82 (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 8577deb (Featire specs)
105 |
105 |
0 |
2.37 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9dc109d (Featire specs)
<<<<<<< HEAD
>>>>>>> dacfb20 (Featire specs)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
>>>>>>> 93db8b1 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5f76842 (Featire specs)
=======
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
>>>>>>> ea0650c (Featire specs)
=======
=======
>>>>>>> 8f1bc14 (Fix)
<<<<<<< HEAD
>>>>>>> 49e3b70 (Fix)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 65f3409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 78d0719 (Featire specs)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> c1749d5 (Featire specs)
<<<<<<< HEAD
>>>>>>> f861b82 (Featire specs)
=======
=======
=======
>>>>>>> 8577deb (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 1cb2e82 (Featire specs)
<<<<<<< HEAD
>>>>>>> 2fd2048 (Featire specs)
=======
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 8577deb (Featire specs)
<<<<<<< HEAD
>>>>>>> bc0ff2c (Featire specs)
=======
=======
>>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
<<<<<<< HEAD
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
=======
=======
2.25 |
>>>>>>> 708d0c9 (Checkout Add CreditCard Address Delivery method)
>>>>>>> 081d138 (Checkout Add CreditCard Address Delivery method)
| spec/factories/order_books.rb |
100.00 % |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
7 |
5 |
5 |
0 |
1.80 |
=======
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
=======
>>>>>>> a5d032d (Fix)
>>>>>>> eaef86a (Fix)
=======
=======
>>>>>>> a1fe6da (Featire specs)
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> 1a9aba9 (Fix)
=======
>>>>>>> dacfb20 (Featire specs)
=======
>>>>>>> 93db8b1 (Featire specs)
=======
>>>>>>> 5f76842 (Featire specs)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> 49e3b70 (Fix)
=======
>>>>>>> 78d0719 (Featire specs)
=======
>>>>>>> f861b82 (Featire specs)
=======
>>>>>>> 2fd2048 (Featire specs)
=======
>>>>>>> bc0ff2c (Featire specs)
=======
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
=======
>>>>>>> a5d032d (Fix)
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> b35d1f8 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> a1fe6da (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 28fed3c (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ed6aebd (Featire specs)
=======
=======
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
>>>>>>> 1a9aba9 (Fix)
=======
=======
>>>>>>> 9dc109d (Featire specs)
<<<<<<< HEAD
>>>>>>> dacfb20 (Featire specs)
=======
=======
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
>>>>>>> 93db8b1 (Featire specs)
=======
=======
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5f76842 (Featire specs)
=======
=======
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
>>>>>>> ea0650c (Featire specs)
=======
=======
>>>>>>> 8f1bc14 (Fix)
<<<<<<< HEAD
>>>>>>> 49e3b70 (Fix)
=======
=======
>>>>>>> 65f3409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 78d0719 (Featire specs)
=======
=======
>>>>>>> c1749d5 (Featire specs)
<<<<<<< HEAD
>>>>>>> f861b82 (Featire specs)
=======
=======
>>>>>>> 1cb2e82 (Featire specs)
<<<<<<< HEAD
>>>>>>> 2fd2048 (Featire specs)
=======
=======
>>>>>>> 8577deb (Featire specs)
<<<<<<< HEAD
>>>>>>> bc0ff2c (Featire specs)
=======
=======
>>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
96 |
49 |
49 |
0 |
1.12 |
| spec/feature/login_spec.rb |
100.00 % |
35 |
19 |
19 |
0 |
1.16 |
| spec/feature/new_password_spec.rb |
100.00 % |
24 |
13 |
13 |
0 |
1.15 |
| spec/feature/registration_spec.rb |
100.00 % |
51 |
29 |
29 |
0 |
1.14 |
| spec/feature/review_spec.rb |
100.00 % |
<<<<<<< HEAD
49 |
30 |
30 |
0 |
1.67 |
=======
46 |
28 |
28 |
0 |
1.71 |
>>>>>>> a5d032d (Fix)
| spec/feature/settings_spec.rb |
100.00 % |
62 |
34 |
34 |
0 |
1.26 |
| spec/feature/shipping_spec.rb |
73.08 % |
42 |
26 |
19 |
7 |
0.77 |
| spec/feature/user_spec.rb |
100.00 % |
76 |
42 |
42 |
0 |
1.10 |
| spec/models/address_spec.rb |
100.00 % |
27 |
20 |
20 |
0 |
1.75 |
| spec/models/admin_user_spec.rb |
100.00 % |
8 |
5 |
5 |
0 |
1.40 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1577aeb (Rebased)
=======
=======
>>>>>>> eaef86a (Fix)
=======
>>>>>>> b35d1f8 (Featire specs)
=======
>>>>>>> 1a9aba9 (Fix)
=======
>>>>>>> dacfb20 (Featire specs)
=======
>>>>>>> 49e3b70 (Fix)
=======
>>>>>>> 78d0719 (Featire specs)
=======
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
=======
>>>>>>> 9dc109d (Featire specs)
=======
>>>>>>> 864f339 (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> a2de409 (Featire specs)
=======
>>>>>>> e54ceb0 (Featire specs)
=======
=======
>>>>>>> 65f3409 (Featire specs)
=======
>>>>>>> c1749d5 (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 1cb2e82 (Featire specs)
=======
>>>>>>> 8577deb (Featire specs)
39 |
20 |
20 |
0 |
1.05 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> a2de409 (Featire specs)
=======
>>>>>>> e54ceb0 (Featire specs)
=======
>>>>>>> 1cb2e82 (Featire specs)
=======
>>>>>>> 8577deb (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8c32a77 (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 56ef3ac (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 113da87 (Featire specs)
=======
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> 5f76842 (Featire specs)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> 2fd2048 (Featire specs)
=======
>>>>>>> bc0ff2c (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8b420cf (Featire specs)
=======
=======
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> eaef86a (Fix)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> b35d1f8 (Featire specs)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> a1fe6da (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 28fed3c (Featire specs)
=======
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ed6aebd (Featire specs)
=======
=======
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
>>>>>>> 1a9aba9 (Fix)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9dc109d (Featire specs)
<<<<<<< HEAD
>>>>>>> dacfb20 (Featire specs)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
>>>>>>> 93db8b1 (Featire specs)
=======
=======
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5f76842 (Featire specs)
=======
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
>>>>>>> ea0650c (Featire specs)
=======
=======
>>>>>>> 8f1bc14 (Fix)
<<<<<<< HEAD
>>>>>>> 49e3b70 (Fix)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 65f3409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 78d0719 (Featire specs)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> c1749d5 (Featire specs)
<<<<<<< HEAD
>>>>>>> f861b82 (Featire specs)
=======
=======
>>>>>>> 1cb2e82 (Featire specs)
<<<<<<< HEAD
>>>>>>> 2fd2048 (Featire specs)
=======
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 8577deb (Featire specs)
<<<<<<< HEAD
>>>>>>> bc0ff2c (Featire specs)
=======
=======
>>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
| spec/factories/orders.rb |
77.78 % |
17 |
9 |
7 |
2 |
1.56 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 7c4ea7f (Fix)
=======
<<<<<<< HEAD
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 95ebdc2 (Featire specs)
=======
>>>>>>> 8f1bc14 (Fix)
| spec/factories/reviews.rb |
>>>>>>> c033601 (Rebased)
100.00 % |
<<<<<<< HEAD
4 |
2 |
2 |
>>>>>>> d96cf3b (Featire specs)
=======
7 |
5 |
5 |
>>>>>>> d780a52 (Rebased)
=======
=======
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> e50f73e (Add login registration pages)
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8be9029 (Add login registration pages)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7d58507 (Add login registration pages)
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
>>>>>>> af9487a (Add login registration pages)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 140c987 (Add login registration pages)
=======
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0c3a150 (Add login registration pages)
=======
>>>>>>> 0b5b269 (Fix)
=======
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 22ee41c (Add login registration pages)
spec/factories/users.rb |
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
>>>>>>> cacbab9 (Add login registration pages)
=======
>>>>>>> bf554f4 (Rebased)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a624084 (Add login registration pages)
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6a9fede (Add login registration pages)
=======
spec/factories/coupons.rb |
100.00 % |
8 |
6 |
6 |
0 |
2.50 |
| spec/factories/order_books.rb |
100.00 % |
7 |
5 |
5 |
0 |
1.80 |
| spec/factories/orders.rb |
77.78 % |
17 |
9 |
7 |
2 |
1.56 |
>>>>>>> 7c4ea7f (Fix)
| spec/factories/reviews.rb |
>>>>>>> c033601 (Rebased)
100.00 % |
<<<<<<< HEAD
4 |
2 |
2 |
>>>>>>> df37394 (Featire specs)
=======
7 |
5 |
5 |
>>>>>>> ee78f39 (Rebased)
=======
=======
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 03c0867 (Add login registration pages)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 45f9f35 (Add login registration pages)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 697ad44 (Add login registration pages)
=======
>>>>>>> 078304c (Rebased)
=======
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 22ee41c (Add login registration pages)
spec/factories/users.rb |
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
>>>>>>> cacbab9 (Add login registration pages)
=======
>>>>>>> bf554f4 (Rebased)
spec/factories/reviews.rb |
>>>>>>> c033601 (Rebased)
100.00 % |
<<<<<<< HEAD
4 |
2 |
2 |
>>>>>>> 715fac2 (Featire specs)
=======
7 |
5 |
5 |
>>>>>>> 836a973 (Rebased)
0 |
1.00 |
<<<<<<< HEAD
| spec/models/book_spec.rb |
100.00 % |
23 |
16 |
16 |
0 |
1.69 |
| spec/models/books_category_spec.rb |
100.00 % |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a5d032d (Fix)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 7c4ea7f (Fix)
=======
>>>>>>> 9dc109d (Featire specs)
=======
>>>>>>> 864f339 (Featire specs)
=======
>>>>>>> a2de409 (Featire specs)
=======
>>>>>>> e54ceb0 (Featire specs)
=======
>>>>>>> 8f1bc14 (Fix)
=======
>>>>>>> 65f3409 (Featire specs)
=======
>>>>>>> c1749d5 (Featire specs)
=======
>>>>>>> 1cb2e82 (Featire specs)
=======
>>>>>>> 8577deb (Featire specs)
=======
>>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
13 |
8 |
8 |
0 |
1.50 |
| spec/models/category_spec.rb |
100.00 % |
14 |
8 |
8 |
0 |
1.38 |
<<<<<<< HEAD
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
1.00 |
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> db0e854 (Add login registration pages)
=======
>>>>>>> 6d21330 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 58d403b (Add login registration pages)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
>>>>>>> 8f1bc14 (Fix)
| spec/factories/shippings.rb |
100.00 % |
10 |
8 |
8 |
0 |
1.00 |
| spec/factories/users.rb |
100.00 % |
7 |
5 |
5 |
0 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0b5b269 (Fix)
=======
>>>>>>> 1ac6be1 (Fix)
=======
>>>>>>> a5d032d (Fix)
=======
>>>>>>> 078304c (Rebased)
=======
=======
>>>>>>> a5d032d (Fix)
>>>>>>> d15fe1d (Fix)
11.00 |
=======
13.40 |
>>>>>>> 7c4ea7f (Fix)
=======
15.20 |
>>>>>>> 8f1bc14 (Fix)
| spec/feature/admin/author_spec.rb |
100.00 % |
57 |
31 |
31 |
0 |
1.48 |
| spec/feature/admin/book_spec.rb |
100.00 % |
<<<<<<< HEAD
61 |
32 |
32 |
0 |
1.41 |
=======
83 |
43 |
43 |
0 |
1.56 |
>>>>>>> a5d032d (Fix)
| spec/feature/admin/category_spec.rb |
100.00 % |
48 |
25 |
25 |
0 |
1.56 |
| spec/feature/billing_spec.rb |
73.08 % |
42 |
26 |
19 |
7 |
0.77 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0b5b269 (Fix)
=======
>>>>>>> d6f7da8 (Featire specs)
=======
>>>>>>> 1ac6be1 (Fix)
=======
=======
>>>>>>> 7375d4b (Manifest_cache true)
3.33 |
>>>>>>> d0dc1f1 (Featire specs)
=======
3.33 |
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> f5da5ac (Featire specs)
=======
>>>>>>> 5f79779 (Featire specs)
=======
3.33 |
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> a5d032d (Fix)
=======
=======
=======
>>>>>>> 7375d4b (Manifest_cache true)
3.33 |
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
=======
3.33 |
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
=======
>>>>>>> 7375d4b (Manifest_cache true)
3.33 |
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
=======
3.33 |
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> c006a44 (Featire specs)
=======
=======
=======
=======
>>>>>>> 7375d4b (Manifest_cache true)
3.33 |
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9dc109d (Featire specs)
<<<<<<< HEAD
>>>>>>> d6f7da8 (Featire specs)
=======
=======
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
>>>>>>> f5da5ac (Featire specs)
=======
=======
=======
3.33 |
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> a2de409 (Featire specs)
>>>>>>> 5f79779 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> aca90e3 (Rebased)
=======
=======
>>>>>>> b6a32ab (Add login registration pages)
=======
>>>>>>> d780a52 (Rebased)
=======
>>>>>>> e50f73e (Add login registration pages)
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 03c0867 (Add login registration pages)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> d96cf3b (Featire specs)
=======
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> f764a87 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 22ee41c (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b6a32ab (Add login registration pages)
=======
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 836a973 (Rebased)
=======
| spec/factories/shippings.rb |
100.00 % |
10 |
8 |
8 |
0 |
1.00 |
| spec/factories/users.rb |
100.00 % |
7 |
5 |
5 |
0 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a5d032d (Fix)
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 836a973 (Rebased)
11.00 |
| spec/feature/admin/author_spec.rb |
100.00 % |
57 |
31 |
31 |
0 |
1.48 |
| spec/feature/admin/book_spec.rb |
100.00 % |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 836a973 (Rebased)
61 |
32 |
32 |
0 |
1.41 |
<<<<<<< HEAD
<<<<<<< HEAD
=======
83 |
43 |
43 |
0 |
1.56 |
>>>>>>> a5d032d (Fix)
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 836a973 (Rebased)
| spec/feature/admin/category_spec.rb |
100.00 % |
48 |
25 |
25 |
0 |
1.56 |
| spec/feature/billing_spec.rb |
73.08 % |
42 |
26 |
19 |
7 |
0.77 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d15fe1d (Fix)
=======
>>>>>>> b4763a2 (Featire specs)
=======
=======
>>>>>>> 7375d4b (Manifest_cache true)
3.33 |
>>>>>>> d0dc1f1 (Featire specs)
=======
3.33 |
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
3.33 |
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> d15fe1d (Fix)
=======
=======
=======
=======
>>>>>>> 7375d4b (Manifest_cache true)
3.33 |
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> b4763a2 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
>>>>>>> bcd09ab (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 852864e (Add login registration pages)
<<<<<<< HEAD
=======
>>>>>>> 282f108 (Add login registration pages)
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> d780a52 (Rebased)
=======
=======
=======
>>>>>>> f182ac7 (Add login registration pages)
=======
>>>>>>> 0005d4a (Add login registration pages)
| spec/factories/users.rb |
100.00 % |
4 |
2 |
2 |
0 |
1.00 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
3.33 |
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> f182ac7 (Add login registration pages)
=======
=======
3.33 |
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 7c4ea7f (Fix)
=======
>>>>>>> 0005d4a (Add login registration pages)
=======
=======
3.33 |
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54ceb0 (Featire specs)
=======
>>>>>>> 8f1bc14 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9ec6862 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 264ef06 (Add login registration pages)
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
=======
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 22ee41c (Add login registration pages)
>>>>>>> e50f73e (Add login registration pages)
=======
=======
>>>>>>> f182ac7 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 852864e (Add login registration pages)
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> 715fac2 (Featire specs)
=======
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 22ee41c (Add login registration pages)
>>>>>>> 03c0867 (Add login registration pages)
=======
=======
>>>>>>> 0005d4a (Add login registration pages)
>>>>>>> 282f108 (Add login registration pages)
| spec/feature/book_spec.rb |
100.00 % |
202 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
spec/feature/book_spec.rb |
100.00 % |
202 |
>>>>>>> a5d032d (Fix)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 7c4ea7f (Fix)
=======
>>>>>>> 9dc109d (Featire specs)
=======
>>>>>>> 864f339 (Featire specs)
=======
>>>>>>> a2de409 (Featire specs)
=======
>>>>>>> e54ceb0 (Featire specs)
=======
>>>>>>> 8f1bc14 (Fix)
104 |
104 |
0 |
2.38 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
=======
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
105 |
105 |
0 |
2.37 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> a5d032d (Fix)
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> cb74525 (Add login registration pages)
=======
<<<<<<< HEAD
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 0fc3bf0 (Add login registration pages)
>>>>>>> c033601 (Rebased)
=======
=======
>>>>>>> f182ac7 (Add login registration pages)
spec/factories/users.rb |
100.00 % |
4 |
2 |
2 |
0 |
1.00 |
<<<<<<< HEAD
<<<<<<< HEAD
=======
3.33 |
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> f182ac7 (Add login registration pages)
=======
=======
3.33 |
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
>>>>>>> 9ec6862 (Add login registration pages)
=======
>>>>>>> f182ac7 (Add login registration pages)
| spec/feature/book_spec.rb |
100.00 % |
202 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
spec/feature/book_spec.rb |
100.00 % |
202 |
>>>>>>> a5d032d (Fix)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 7c4ea7f (Fix)
104 |
104 |
0 |
2.38 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ee78f39 (Rebased)
=======
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> b4763a2 (Featire specs)
=======
>>>>>>> 0b5b269 (Fix)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
=======
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
105 |
105 |
0 |
2.37 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 563720e (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9bf83f (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
=======
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
| spec/feature/cart_spec.rb |
100.00 % |
56 |
29 |
29 |
0 |
1.45 |
| spec/feature/checkout_spec.rb |
100.00 % |
62 |
36 |
36 |
0 |
1.25 |
| spec/feature/coupon_spec.rb |
100.00 % |
50 |
30 |
30 |
0 |
2.17 |
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
>>>>>>> 1d59aaa (Fix)
=======
=======
<<<<<<< HEAD
>>>>>>> 039806b (Add login registration pages)
=======
>>>>>>> d15fe1d (Fix)
>>>>>>> c033601 (Rebased)
=======
spec/factories/users.rb |
100.00 % |
4 |
2 |
2 |
0 |
1.00 |
=======
3.33 |
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 9ec6862 (Add login registration pages)
| spec/feature/book_spec.rb |
100.00 % |
202 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
spec/feature/book_spec.rb |
100.00 % |
202 |
>>>>>>> a5d032d (Fix)
104 |
104 |
0 |
2.38 |
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 836a973 (Rebased)
=======
=======
>>>>>>> d15fe1d (Fix)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 08edf50 (Featire specs)
=======
=======
=======
>>>>>>> d6f7da8 (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> f5da5ac (Featire specs)
=======
>>>>>>> 5f79779 (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 56a05fb (Featire specs)
105 |
105 |
0 |
2.37 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 2a25e4c (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 3e9f99d (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5be567f (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 2ee03d3 (Featire specs)
=======
=======
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> d15fe1d (Fix)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> b4763a2 (Featire specs)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> bcd09ab (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> c006a44 (Featire specs)
=======
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 848bfa2 (Featire specs)
=======
=======
| spec/feature/cart_spec.rb |
96.55 % |
56 |
29 |
28 |
1 |
1.41 |
| spec/feature/coupon_spec.rb |
100.00 % |
50 |
30 |
30 |
0 |
2.17 |
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 0b5b269 (Fix)
=======
=======
>>>>>>> f5da5ac (Featire specs)
=======
>>>>>>> 5f79779 (Featire specs)
=======
>>>>>>> 56a05fb (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9dc109d (Featire specs)
<<<<<<< HEAD
>>>>>>> d6f7da8 (Featire specs)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
>>>>>>> f5da5ac (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5f79779 (Featire specs)
=======
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 56a05fb (Featire specs)
=======
=======
>>>>>>> 8f1bc14 (Fix)
>>>>>>> 1ac6be1 (Fix)
| spec/feature/home_spec.rb |
100.00 % |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> b4763a2 (Featire specs)
=======
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> 0b5b269 (Fix)
=======
>>>>>>> d6f7da8 (Featire specs)
=======
>>>>>>> f5da5ac (Featire specs)
=======
>>>>>>> 5f79779 (Featire specs)
=======
>>>>>>> 56a05fb (Featire specs)
=======
>>>>>>> 1ac6be1 (Fix)
=======
>>>>>>> a5d032d (Fix)
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
=======
>>>>>>> a5d032d (Fix)
>>>>>>> d15fe1d (Fix)
=======
>>>>>>> b4763a2 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> c006a44 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> 0b5b269 (Fix)
=======
=======
>>>>>>> 9dc109d (Featire specs)
<<<<<<< HEAD
>>>>>>> d6f7da8 (Featire specs)
=======
=======
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
>>>>>>> f5da5ac (Featire specs)
=======
=======
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5f79779 (Featire specs)
=======
=======
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 56a05fb (Featire specs)
=======
=======
>>>>>>> 8f1bc14 (Fix)
>>>>>>> 1ac6be1 (Fix)
96 |
49 |
49 |
0 |
1.12 |
| spec/feature/login_spec.rb |
100.00 % |
35 |
19 |
19 |
0 |
1.16 |
| spec/feature/new_password_spec.rb |
100.00 % |
24 |
13 |
13 |
0 |
1.15 |
| spec/feature/registration_spec.rb |
100.00 % |
51 |
29 |
29 |
0 |
1.14 |
| spec/feature/review_spec.rb |
100.00 % |
<<<<<<< HEAD
49 |
30 |
30 |
0 |
1.67 |
=======
46 |
28 |
28 |
0 |
1.71 |
>>>>>>> a5d032d (Fix)
| spec/feature/settings_spec.rb |
100.00 % |
62 |
34 |
34 |
0 |
1.26 |
| spec/feature/shipping_spec.rb |
73.08 % |
42 |
26 |
19 |
7 |
0.77 |
| spec/feature/user_spec.rb |
100.00 % |
76 |
42 |
42 |
0 |
1.10 |
| spec/models/admin_user_spec.rb |
100.00 % |
8 |
5 |
5 |
0 |
1.40 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
39 |
20 |
20 |
0 |
1.05 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> a5d032d (Fix)
=======
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
=======
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
96 |
49 |
49 |
0 |
=======
96 |
49 |
49 |
0 |
>>>>>>> 836a973 (Rebased)
1.12 |
| spec/feature/login_spec.rb |
100.00 % |
35 |
19 |
19 |
0 |
1.16 |
| spec/feature/new_password_spec.rb |
100.00 % |
24 |
13 |
13 |
0 |
1.15 |
| spec/feature/registration_spec.rb |
100.00 % |
51 |
29 |
29 |
0 |
1.14 |
| spec/feature/review_spec.rb |
100.00 % |
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 836a973 (Rebased)
49 |
30 |
30 |
0 |
1.67 |
<<<<<<< HEAD
=======
46 |
28 |
28 |
0 |
1.71 |
>>>>>>> a5d032d (Fix)
=======
>>>>>>> 836a973 (Rebased)
| spec/feature/settings_spec.rb |
100.00 % |
62 |
34 |
34 |
0 |
1.26 |
| spec/feature/shipping_spec.rb |
73.08 % |
42 |
26 |
19 |
7 |
0.77 |
| spec/feature/user_spec.rb |
100.00 % |
76 |
42 |
42 |
0 |
1.10 |
| spec/models/admin_user_spec.rb |
100.00 % |
8 |
5 |
5 |
0 |
1.40 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ee78f39 (Rebased)
=======
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> d15fe1d (Fix)
=======
>>>>>>> b4763a2 (Featire specs)
=======
>>>>>>> 0b5b269 (Fix)
=======
>>>>>>> d6f7da8 (Featire specs)
=======
>>>>>>> 1ac6be1 (Fix)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
=======
>>>>>>> 9dc109d (Featire specs)
=======
>>>>>>> 864f339 (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> a2de409 (Featire specs)
=======
>>>>>>> e54ceb0 (Featire specs)
39 |
20 |
20 |
0 |
1.05 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> a2de409 (Featire specs)
=======
>>>>>>> e54ceb0 (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 563720e (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a9bf83f (Featire specs)
=======
=======
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> 5f79779 (Featire specs)
=======
>>>>>>> 56a05fb (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
=======
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> 872e675 (Fix)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
=======
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> 848bfa2 (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
=======
=======
>>>>>>> a5d032d (Fix)
>>>>>>> d15fe1d (Fix)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
>>>>>>> b4763a2 (Featire specs)
=======
>>>>>>> bcd09ab (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 0b5b269 (Fix)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9dc109d (Featire specs)
<<<<<<< HEAD
>>>>>>> d6f7da8 (Featire specs)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
>>>>>>> f5da5ac (Featire specs)
=======
=======
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5f79779 (Featire specs)
=======
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 56a05fb (Featire specs)
=======
=======
>>>>>>> 8f1bc14 (Fix)
>>>>>>> 1ac6be1 (Fix)
| spec/models/author_spec.rb |
100.00 % |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a5d032d (Fix)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
=======
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> 0b5b269 (Fix)
=======
>>>>>>> d6f7da8 (Featire specs)
=======
>>>>>>> f5da5ac (Featire specs)
=======
>>>>>>> 5f79779 (Featire specs)
=======
>>>>>>> 56a05fb (Featire specs)
=======
>>>>>>> 1ac6be1 (Fix)
=======
>>>>>>> a5d032d (Fix)
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
=======
>>>>>>> a5d032d (Fix)
>>>>>>> d15fe1d (Fix)
=======
=======
>>>>>>> a5d032d (Fix)
=======
>>>>>>> 9620751 (Featire specs)
>>>>>>> b4763a2 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
>>>>>>> bcd09ab (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> c006a44 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> 848bfa2 (Featire specs)
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 0b5b269 (Fix)
=======
=======
>>>>>>> 9dc109d (Featire specs)
<<<<<<< HEAD
>>>>>>> d6f7da8 (Featire specs)
=======
=======
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
>>>>>>> f5da5ac (Featire specs)
=======
=======
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5f79779 (Featire specs)
=======
=======
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 56a05fb (Featire specs)
=======
=======
>>>>>>> 8f1bc14 (Fix)
>>>>>>> 1ac6be1 (Fix)
13 |
8 |
8 |
0 |
1.50 |
| spec/models/authors_book_spec.rb |
100.00 % |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
13 |
8 |
8 |
0 |
1.50 |
| spec/models/billing_spec.rb |
100.00 % |
27 |
20 |
20 |
0 |
1.75 |
| spec/models/book_spec.rb |
100.00 % |
23 |
16 |
16 |
0 |
1.75 |
| spec/models/books_category_spec.rb |
100.00 % |
13 |
8 |
8 |
0 |
1.50 |
| spec/models/category_spec.rb |
100.00 % |
12 |
7 |
7 |
0 |
1.43 |
| spec/models/order_spec.rb |
100.00 % |
10 |
6 |
6 |
0 |
1.33 |
| spec/models/review_spec.rb |
100.00 % |
20 |
14 |
14 |
0 |
1.64 |
| spec/models/shipping_spec.rb |
100.00 % |
27 |
20 |
20 |
0 |
1.75 |
| spec/models/user_spec.rb |
100.00 % |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d15fe1d (Fix)
=======
>>>>>>> b4763a2 (Featire specs)
=======
>>>>>>> 0b5b269 (Fix)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> a5d032d (Fix)
=======
<<<<<<< HEAD
>>>>>>> 3e9f99d (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
=======
>>>>>>> a5d032d (Fix)
>>>>>>> d15fe1d (Fix)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> b4763a2 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> bcd09ab (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> c006a44 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> 848bfa2 (Featire specs)
15 |
9 |
9 |
=======
13 |
8 |
8 |
<<<<<<< HEAD
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 0b5b269 (Fix)
0 |
1.50 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a5d032d (Fix)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
=======
>>>>>>> a5d032d (Fix)
>>>>>>> d15fe1d (Fix)
=======
=======
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> 0b5b269 (Fix)
=======
>>>>>>> a5d032d (Fix)
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> b4763a2 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> bcd09ab (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> c006a44 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 848bfa2 (Featire specs)
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 0b5b269 (Fix)
| spec/queryes/book_query_spec.rb |
100.00 % |
77 |
45 |
45 |
0 |
<<<<<<< HEAD
<<<<<<< HEAD
1.38 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> d96cf3b (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
1.00 |
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> d96cf3b (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
1.00 |
>>>>>>> bd8bda4 (Manifest_cache true)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
1.00 |
>>>>>>> aa7b40c (Manifest_cache true)
| spec/models/user_spec.rb |
100.00 % |
5 |
3 |
3 |
0 |
1.00 |
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
1.00 |
>>>>>>> 183b6c5 (Manifest_cache true)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> d96cf3b (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
=======
=======
1.00 |
>>>>>>> 183b6c5 (Manifest_cache true)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> f764a87 (Fix book_spec decrease quantity and price)
| spec/models/user_spec.rb |
100.00 % |
5 |
3 |
3 |
0 |
1.00 |
=======
1.53 |
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a5d032d (Fix)
=======
1.00 |
>>>>>>> cde4834 (Manifest_cache true)
| spec/rails_helper.rb |
87.50 % |
23 |
16 |
14 |
2 |
0.88 |
<<<<<<< HEAD
=======
1.53 |
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> aca90e3 (Rebased)
=======
>>>>>>> c033601 (Rebased)
>>>>>>> d780a52 (Rebased)
=======
>>>>>>> c033601 (Rebased)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
spec/models/authors_book_spec.rb |
100.00 % |
=======
>>>>>>> d6f7da8 (Featire specs)
=======
>>>>>>> f5da5ac (Featire specs)
=======
>>>>>>> 5f79779 (Featire specs)
=======
>>>>>>> 56a05fb (Featire specs)
=======
>>>>>>> 1ac6be1 (Fix)
13 |
8 |
8 |
0 |
1.50 |
| spec/models/billing_spec.rb |
100.00 % |
27 |
20 |
20 |
0 |
1.75 |
| spec/models/book_spec.rb |
100.00 % |
23 |
16 |
16 |
0 |
1.75 |
| spec/models/books_category_spec.rb |
100.00 % |
13 |
8 |
8 |
0 |
1.50 |
| spec/models/category_spec.rb |
100.00 % |
12 |
7 |
7 |
0 |
1.43 |
| spec/models/order_spec.rb |
100.00 % |
10 |
6 |
6 |
0 |
1.33 |
| spec/models/review_spec.rb |
100.00 % |
20 |
14 |
14 |
0 |
1.64 |
| spec/models/shipping_spec.rb |
100.00 % |
27 |
20 |
20 |
0 |
1.75 |
| spec/models/user_spec.rb |
100.00 % |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> a5d032d (Fix)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
15 |
9 |
9 |
=======
13 |
8 |
8 |
>>>>>>> 7c4ea7f (Fix)
=======
15 |
9 |
9 |
>>>>>>> 8f1bc14 (Fix)
0 |
1.44 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a5d032d (Fix)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 7c4ea7f (Fix)
=======
>>>>>>> 9dc109d (Featire specs)
=======
>>>>>>> 864f339 (Featire specs)
=======
>>>>>>> a2de409 (Featire specs)
=======
>>>>>>> 0005d4a (Add login registration pages)
=======
>>>>>>> e54ceb0 (Featire specs)
=======
>>>>>>> 8f1bc14 (Fix)
| spec/queryes/book_query_spec.rb |
100.00 % |
77 |
45 |
45 |
0 |
<<<<<<< HEAD
<<<<<<< HEAD
1.38 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
1.00 |
<<<<<<< HEAD
>>>>>>> 02a399d (Manifest_cache true)
=======
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
1.00 |
>>>>>>> bd8bda4 (Manifest_cache true)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
<<<<<<< HEAD
1.00 |
>>>>>>> aa7b40c (Manifest_cache true)
=======
>>>>>>> 0005d4a (Add login registration pages)
| spec/models/user_spec.rb |
100.00 % |
5 |
3 |
3 |
0 |
1.00 |
<<<<<<< HEAD
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
1.00 |
>>>>>>> 183b6c5 (Manifest_cache true)
| spec/models/user_spec.rb |
100.00 % |
5 |
3 |
3 |
0 |
1.00 |
=======
>>>>>>> 7a02bbe (Featire specs)
=======
1.00 |
>>>>>>> fd6db03 (Manifest_cache true)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
| spec/models/user_spec.rb |
100.00 % |
5 |
3 |
3 |
0 |
1.00 |
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
=======
=======
1.00 |
>>>>>>> 183b6c5 (Manifest_cache true)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0005d4a (Add login registration pages)
>>>>>>> 282f108 (Add login registration pages)
<<<<<<< HEAD
| spec/models/user_spec.rb |
100.00 % |
5 |
3 |
3 |
0 |
1.00 |
=======
1.53 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a5d032d (Fix)
=======
=======
>>>>>>> 9dc109d (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 864f339 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> a2de409 (Featire specs)
=======
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> 0005d4a (Add login registration pages)
| spec/rails_helper.rb |
87.50 % |
23 |
16 |
14 |
2 |
0.88 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 83979de (Featire specs)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 12bcf81 (Featire specs)
=======
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3e35e (Featire specs)
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 1677b1a (Featire specs)
=======
=======
1.00 |
>>>>>>> bf554f4 (Rebased)
>>>>>>> d52ad35 (Rebased)
=======
=======
>>>>>>> d6f7da8 (Featire specs)
=======
>>>>>>> f5da5ac (Featire specs)
=======
>>>>>>> 5f79779 (Featire specs)
=======
1.53 |
<<<<<<< HEAD
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> ee78f39 (Rebased)
=======
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
=======
=======
>>>>>>> 9620751 (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
spec/models/authors_book_spec.rb |
100.00 % |
15 |
9 |
9 |
=======
13 |
8 |
8 |
>>>>>>> 836a973 (Rebased)
0 |
1.50 |
| spec/models/billing_spec.rb |
100.00 % |
27 |
20 |
20 |
0 |
1.75 |
| spec/models/book_spec.rb |
100.00 % |
23 |
16 |
16 |
0 |
1.75 |
| spec/models/books_category_spec.rb |
100.00 % |
13 |
8 |
8 |
0 |
1.50 |
| spec/models/category_spec.rb |
100.00 % |
12 |
7 |
7 |
0 |
1.43 |
| spec/models/review_spec.rb |
100.00 % |
20 |
14 |
14 |
0 |
1.64 |
| spec/models/shipping_spec.rb |
100.00 % |
27 |
20 |
20 |
0 |
1.75 |
| spec/models/user_spec.rb |
100.00 % |
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 2a25e4c (Featire specs)
15 |
9 |
9 |
0 |
1.44 |
<<<<<<< HEAD
| spec/queryes/book_query_spec.rb |
100.00 % |
77 |
45 |
45 |
0 |
<<<<<<< HEAD
1.38 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
1.00 |
<<<<<<< HEAD
>>>>>>> 02a399d (Manifest_cache true)
=======
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 715fac2 (Featire specs)
=======
1.00 |
>>>>>>> bd8bda4 (Manifest_cache true)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 715fac2 (Featire specs)
=======
1.00 |
>>>>>>> aa7b40c (Manifest_cache true)
| spec/models/user_spec.rb |
100.00 % |
5 |
3 |
3 |
0 |
1.00 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 08edf50 (Featire specs)
=======
1.00 |
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
| spec/models/user_spec.rb |
100.00 % |
5 |
3 |
3 |
0 |
1.00 |
=======
>>>>>>> 7a02bbe (Featire specs)
=======
1.00 |
>>>>>>> fd6db03 (Manifest_cache true)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
| spec/models/user_spec.rb |
100.00 % |
5 |
3 |
3 |
0 |
1.00 |
=======
>>>>>>> 9620751 (Featire specs)
=======
=======
1.00 |
<<<<<<< HEAD
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 845dac1 (Manifest_cache true)
=======
=======
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
=======
1.00 |
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> c4adab0 (Featire specs)
=======
=======
1.00 |
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> f182ac7 (Add login registration pages)
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
| spec/models/user_spec.rb |
100.00 % |
5 |
3 |
3 |
0 |
1.00 |
=======
>>>>>>> 7a02bbe (Featire specs)
=======
1.00 |
>>>>>>> fd6db03 (Manifest_cache true)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
| spec/models/user_spec.rb |
100.00 % |
5 |
3 |
3 |
0 |
1.00 |
=======
>>>>>>> 4552227 (Featire specs)
=======
1.00 |
>>>>>>> 998f08d (Manifest_cache true)
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
| spec/models/user_spec.rb |
100.00 % |
5 |
3 |
3 |
0 |
1.00 |
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> 715fac2 (Featire specs)
=======
=======
=======
1.00 |
>>>>>>> 183b6c5 (Manifest_cache true)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
| spec/models/user_spec.rb |
100.00 % |
5 |
3 |
3 |
0 |
1.00 |
=======
1.53 |
>>>>>>> a5d032d (Fix)
| spec/rails_helper.rb |
87.50 % |
23 |
16 |
14 |
2 |
0.88 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 563720e (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9bf83f (Featire specs)
=======
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
=======
1.00 |
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
>>>>>>> 49e8a6c (Rebased)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
=======
>>>>>>> 4552227 (Featire specs)
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
=======
=======
1.53 |
<<<<<<< HEAD
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> 836a973 (Rebased)
=======
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
=======
=======
>>>>>>> 9620751 (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
spec/models/authors_book_spec.rb |
100.00 % |
13 |
8 |
8 |
0 |
1.50 |
| spec/models/book_spec.rb |
100.00 % |
23 |
16 |
16 |
0 |
1.75 |
| spec/models/books_category_spec.rb |
100.00 % |
13 |
8 |
8 |
0 |
1.50 |
| spec/models/category_spec.rb |
100.00 % |
12 |
7 |
7 |
0 |
1.43 |
| spec/models/credit_card_spec.rb |
100.00 % |
19 |
13 |
13 |
0 |
1.69 |
| spec/models/delivery_spec.rb |
100.00 % |
11 |
6 |
6 |
0 |
1.33 |
| spec/models/order_spec.rb |
100.00 % |
10 |
6 |
6 |
0 |
1.33 |
| spec/models/review_spec.rb |
100.00 % |
20 |
14 |
14 |
0 |
1.64 |
| spec/models/user_spec.rb |
100.00 % |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a5d032d (Fix)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
15 |
9 |
9 |
=======
13 |
8 |
8 |
>>>>>>> 7c4ea7f (Fix)
=======
15 |
9 |
9 |
>>>>>>> 8f1bc14 (Fix)
0 |
1.44 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a5d032d (Fix)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 7c4ea7f (Fix)
=======
>>>>>>> 9dc109d (Featire specs)
=======
>>>>>>> 864f339 (Featire specs)
=======
>>>>>>> a2de409 (Featire specs)
=======
>>>>>>> 0005d4a (Add login registration pages)
=======
>>>>>>> e54ceb0 (Featire specs)
=======
>>>>>>> 8f1bc14 (Fix)
| spec/queryes/book_query_spec.rb |
100.00 % |
77 |
45 |
45 |
0 |
<<<<<<< HEAD
<<<<<<< HEAD
1.38 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 3dc272d (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
1.00 |
<<<<<<< HEAD
>>>>>>> 02a399d (Manifest_cache true)
=======
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3dc272d (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
1.00 |
>>>>>>> bd8bda4 (Manifest_cache true)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
1.00 |
>>>>>>> aa7b40c (Manifest_cache true)
=======
=======
<<<<<<< HEAD
1.00 |
>>>>>>> aa7b40c (Manifest_cache true)
=======
>>>>>>> 0005d4a (Add login registration pages)
| spec/models/user_spec.rb |
100.00 % |
5 |
3 |
3 |
0 |
1.00 |
<<<<<<< HEAD
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> 3dc272d (Featire specs)
=======
=======
=======
1.00 |
>>>>>>> 183b6c5 (Manifest_cache true)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
| spec/models/user_spec.rb |
100.00 % |
5 |
3 |
3 |
0 |
1.00 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 08edf50 (Featire specs)
=======
1.00 |
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
=======
=======
1.53 |
>>>>>>> a5d032d (Fix)
>>>>>>> eaef86a (Fix)
=======
=======
>>>>>>> 0005d4a (Add login registration pages)
>>>>>>> 01d9256 (Add login registration pages)
<<<<<<< HEAD
| spec/models/user_spec.rb |
100.00 % |
5 |
3 |
3 |
0 |
1.00 |
=======
<<<<<<< HEAD
>>>>>>> 7a02bbe (Featire specs)
=======
1.00 |
>>>>>>> fd6db03 (Manifest_cache true)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
1.53 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a5d032d (Fix)
>>>>>>> b35d1f8 (Featire specs)
<<<<<<< HEAD
| spec/models/user_spec.rb |
100.00 % |
5 |
3 |
3 |
0 |
1.00 |
=======
>>>>>>> 9620751 (Featire specs)
=======
=======
1.00 |
<<<<<<< HEAD
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 845dac1 (Manifest_cache true)
=======
=======
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
=======
1.00 |
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> c4adab0 (Featire specs)
=======
=======
1.00 |
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> f182ac7 (Add login registration pages)
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
| spec/models/user_spec.rb |
100.00 % |
5 |
3 |
3 |
0 |
1.00 |
=======
>>>>>>> 7a02bbe (Featire specs)
=======
1.00 |
>>>>>>> fd6db03 (Manifest_cache true)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
| spec/models/user_spec.rb |
100.00 % |
5 |
3 |
3 |
0 |
1.00 |
=======
>>>>>>> 4552227 (Featire specs)
=======
1.00 |
>>>>>>> 998f08d (Manifest_cache true)
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 58d403b (Add login registration pages)
=======
=======
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> b575a28 (Add login registration pages)
=======
=======
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 5caffae (Add login registration pages)
| spec/models/user_spec.rb |
100.00 % |
5 |
3 |
3 |
0 |
1.00 |
=======
>>>>>>> 27ceb6f (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 1214e1f (Add login registration pages)
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54ceb0 (Featire specs)
=======
=======
>>>>>>> b575a28 (Add login registration pages)
=======
>>>>>>> 5caffae (Add login registration pages)
>>>>>>> 1214e1f (Add login registration pages)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 58d403b (Add login registration pages)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 95ebdc2 (Featire specs)
=======
=======
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> b575a28 (Add login registration pages)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5a0bcc7 (Featire specs)
=======
=======
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 5caffae (Add login registration pages)
=======
>>>>>>> 27ceb6f (Add login registration pages)
=======
=======
=======
>>>>>>> 9dc109d (Featire specs)
<<<<<<< HEAD
>>>>>>> dacfb20 (Featire specs)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
>>>>>>> 93db8b1 (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5f76842 (Featire specs)
=======
=======
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> 0005d4a (Add login registration pages)
>>>>>>> 01d9256 (Add login registration pages)
| spec/rails_helper.rb |
87.50 % |
23 |
16 |
14 |
2 |
0.88 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 2a25e4c (Featire specs)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 3e9f99d (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5be567f (Featire specs)
=======
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 2ee03d3 (Featire specs)
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5506bd0 (Featire specs)
=======
=======
1.00 |
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
>>>>>>> 078304c (Rebased)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> b4763a2 (Featire specs)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> bcd09ab (Featire specs)
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> e54ceb0 (Featire specs)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
>>>>>>> 5a0bcc7 (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> c006a44 (Featire specs)
=======
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 848bfa2 (Featire specs)
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9ca3b84 (Featire specs)
=======
=======
=======
>>>>>>> 4552227 (Featire specs)
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> fefbd35 (Featire specs)
=======
=======
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
>>>>>>> 0b5b269 (Fix)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9dc109d (Featire specs)
<<<<<<< HEAD
>>>>>>> d6f7da8 (Featire specs)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
>>>>>>> f5da5ac (Featire specs)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5f79779 (Featire specs)
=======
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 56a05fb (Featire specs)
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6d21330 (Featire specs)
=======
=======
=======
>>>>>>> 4552227 (Featire specs)
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 27e3351 (Featire specs)
=======
=======
>>>>>>> 8f1bc14 (Fix)
>>>>>>> 1ac6be1 (Fix)
=======
>>>>>>> cde4834 (Manifest_cache true)
=======
=======
>>>>>>> dacfb20 (Featire specs)
=======
>>>>>>> 93db8b1 (Featire specs)
=======
>>>>>>> 5f76842 (Featire specs)
=======
1.53 |
<<<<<<< HEAD
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> 1577aeb (Rebased)
=======
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
=======
=======
>>>>>>> 9620751 (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
spec/models/authors_book_spec.rb |
100.00 % |
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 65f3409 (Featire specs)
=======
>>>>>>> c1749d5 (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 1cb2e82 (Featire specs)
=======
>>>>>>> 8577deb (Featire specs)
=======
>>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
15 |
9 |
9 |
0 |
1.44 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
| spec/models/book_spec.rb |
=======
=======
>>>>>>> c1749d5 (Featire specs)
=======
>>>>>>> 1cb2e82 (Featire specs)
=======
>>>>>>> 8577deb (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
spec/queryes/book_query_spec.rb |
>>>>>>> 65f3409 (Featire specs)
100.00 % |
23 |
16 |
16 |
0 |
<<<<<<< HEAD
=======
1.53 |
<<<<<<< HEAD
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
spec/models/authors_book_spec.rb |
100.00 % |
15 |
9 |
9 |
0 |
1.44 |
| spec/models/book_spec.rb |
100.00 % |
23 |
16 |
16 |
0 |
>>>>>>> 65f3409 (Featire specs)
1.69 |
| spec/models/books_category_spec.rb |
100.00 % |
15 |
9 |
9 |
0 |
1.44 |
| spec/models/category_spec.rb |
100.00 % |
14 |
8 |
8 |
0 |
1.38 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> c1749d5 (Featire specs)
=======
>>>>>>> 1cb2e82 (Featire specs)
=======
>>>>>>> 8577deb (Featire specs)
=======
1.00 |
<<<<<<< HEAD
>>>>>>> 02a399d (Manifest_cache true)
=======
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
1.00 |
>>>>>>> bd8bda4 (Manifest_cache true)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
1.00 |
>>>>>>> aa7b40c (Manifest_cache true)
=======
>>>>>>> 65f3409 (Featire specs)
=======
=======
1.00 |
<<<<<<< HEAD
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e991554 (Manifest_cache true)
=======
=======
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> b8aab1a (Manifest_cache true)
=======
>>>>>>> c1749d5 (Featire specs)
=======
=======
1.00 |
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> 3c386ca (Manifest_cache true)
=======
>>>>>>> 1cb2e82 (Featire specs)
=======
=======
1.00 |
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> fe7e312 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
| spec/models/user_spec.rb |
100.00 % |
5 |
3 |
3 |
0 |
1.00 |
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 08edf50 (Featire specs)
=======
1.00 |
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
| spec/models/user_spec.rb |
100.00 % |
5 |
3 |
3 |
0 |
1.00 |
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 7a02bbe (Featire specs)
=======
1.00 |
>>>>>>> fd6db03 (Manifest_cache true)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8577deb (Featire specs)
=======
=======
1.00 |
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 94d9078 (Manifest_cache true)
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> ebe5361 (Featire specs)
| spec/models/user_spec.rb |
100.00 % |
5 |
3 |
3 |
0 |
1.00 |
<<<<<<< HEAD
=======
>>>>>>> 9620751 (Featire specs)
=======
=======
1.00 |
<<<<<<< HEAD
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 845dac1 (Manifest_cache true)
=======
=======
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
=======
1.00 |
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> c4adab0 (Featire specs)
=======
=======
1.00 |
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> f182ac7 (Add login registration pages)
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
| spec/models/user_spec.rb |
100.00 % |
5 |
3 |
3 |
0 |
1.00 |
=======
>>>>>>> 7a02bbe (Featire specs)
=======
1.00 |
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2956182 (Manifest_cache true)
| spec/models/user_spec.rb |
100.00 % |
5 |
3 |
3 |
0 |
1.00 |
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4552227 (Featire specs)
=======
1.00 |
>>>>>>> 998f08d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 089f8cf (Add login registration pages)
=======
=======
>>>>>>> 4552227 (Featire specs)
>>>>>>> d3d58e0 (Featire specs)
=======
>>>>>>> 9d9ff14 (Manifest_cache true)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 59078f6 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 58d403b (Add login registration pages)
=======
=======
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> b575a28 (Add login registration pages)
=======
=======
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 5caffae (Add login registration pages)
=======
>>>>>>> fb10fe4 (Add login registration pages)
=======
>>>>>>> 0edd9b7 (Add login registration pages)
| spec/models/user_spec.rb |
100.00 % |
5 |
3 |
3 |
0 |
1.00 |
<<<<<<< HEAD
=======
>>>>>>> 69eb97e (Add login registration pages)
=======
>>>>>>> 0edd9b7 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 1214e1f (Add login registration pages)
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54ceb0 (Featire specs)
=======
=======
>>>>>>> b575a28 (Add login registration pages)
=======
>>>>>>> 5caffae (Add login registration pages)
>>>>>>> 1214e1f (Add login registration pages)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 58d403b (Add login registration pages)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 95ebdc2 (Featire specs)
=======
=======
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> b575a28 (Add login registration pages)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5a0bcc7 (Featire specs)
=======
=======
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 5caffae (Add login registration pages)
=======
>>>>>>> 65f3409 (Featire specs)
=======
>>>>>>> fb10fe4 (Add login registration pages)
=======
>>>>>>> 69eb97e (Add login registration pages)
=======
>>>>>>> 089f8cf (Add login registration pages)
=======
>>>>>>> 0edd9b7 (Add login registration pages)
| spec/rails_helper.rb |
87.50 % |
23 |
16 |
14 |
2 |
0.88 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 8c32a77 (Featire specs)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 56ef3ac (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 113da87 (Featire specs)
=======
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 8b420cf (Featire specs)
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 20256f8 (Featire specs)
=======
=======
1.00 |
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
>>>>>>> bebaea7 (Rebased)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> b35d1f8 (Featire specs)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> a1fe6da (Featire specs)
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> e54ceb0 (Featire specs)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
>>>>>>> 5a0bcc7 (Featire specs)
=======
>>>>>>> 8577deb (Featire specs)
=======
>>>>>>> ebe5361 (Featire specs)
=======
>>>>>>> d3d58e0 (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 28fed3c (Featire specs)
=======
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ed6aebd (Featire specs)
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> 64d4167 (Featire specs)
=======
=======
=======
>>>>>>> 4552227 (Featire specs)
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 13fd74f (Featire specs)
=======
=======
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
>>>>>>> 1a9aba9 (Fix)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9dc109d (Featire specs)
<<<<<<< HEAD
>>>>>>> dacfb20 (Featire specs)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
>>>>>>> 93db8b1 (Featire specs)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5f76842 (Featire specs)
=======
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
>>>>>>> ea0650c (Featire specs)
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
>>>>>>> a038b16 (Featire specs)
=======
=======
=======
>>>>>>> 4552227 (Featire specs)
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
>>>>>>> d7fadcd (Featire specs)
=======
=======
>>>>>>> 8f1bc14 (Fix)
<<<<<<< HEAD
>>>>>>> 49e3b70 (Fix)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 65f3409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 78d0719 (Featire specs)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> c1749d5 (Featire specs)
<<<<<<< HEAD
>>>>>>> f861b82 (Featire specs)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 1cb2e82 (Featire specs)
<<<<<<< HEAD
>>>>>>> 2fd2048 (Featire specs)
=======
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 8577deb (Featire specs)
<<<<<<< HEAD
>>>>>>> bc0ff2c (Featire specs)
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> ebe5361 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9bf2aae (Featire specs)
=======
=======
=======
>>>>>>> 4552227 (Featire specs)
>>>>>>> d3d58e0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5ce1a6d (Featire specs)
=======
=======
>>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
| spec/support/configs/capybara.rb |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
100.00 % |
>>>>>>> 8577deb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
100.00 % |
>>>>>>> 59078f6 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
<<<<<<< HEAD
100.00 % |
>>>>>>> 9d9ff14 (Manifest_cache true)
<<<<<<< HEAD
=======
<<<<<<< HEAD
100.00 % |
>>>>>>> d3d58e0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
100.00 % |
>>>>>>> a455e8a (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
<<<<<<< HEAD
100.00 % |
>>>>>>> 2956182 (Manifest_cache true)
<<<<<<< HEAD
=======
<<<<<<< HEAD
100.00 % |
>>>>>>> ebe5361 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
100.00 % |
>>>>>>> 7b112c2 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
<<<<<<< HEAD
100.00 % |
>>>>>>> 94d9078 (Manifest_cache true)
<<<<<<< HEAD
=======
<<<<<<< HEAD
100.00 % |
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
100.00 % |
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
<<<<<<< HEAD
100.00 % |
>>>>>>> 0832698 (Manifest_cache true)
<<<<<<< HEAD
=======
<<<<<<< HEAD
100.00 % |
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
100.00 % |
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
<<<<<<< HEAD
100.00 % |
>>>>>>> 3b839af (Manifest_cache true)
<<<<<<< HEAD
=======
<<<<<<< HEAD
100.00 % |
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
100.00 % |
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
<<<<<<< HEAD
100.00 % |
>>>>>>> 1bfc7a6 (Manifest_cache true)
<<<<<<< HEAD
=======
<<<<<<< HEAD
100.00 % |
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
100.00 % |
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
<<<<<<< HEAD
100.00 % |
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
=======
<<<<<<< HEAD
100.00 % |
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
100.00 % |
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
<<<<<<< HEAD
100.00 % |
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
=======
<<<<<<< HEAD
100.00 % |
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
100.00 % |
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
<<<<<<< HEAD
100.00 % |
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
=======
=======
=======
<<<<<<< HEAD
100.00 % |
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
100.00 % |
>>>>>>> 00f8b58 (Manifest_cache true)
<<<<<<< HEAD
100.00 % |
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
100.00 % |
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
100.00 % |
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
<<<<<<< HEAD
100.00 % |
>>>>>>> 24b58e6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
100.00 % |
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
100.00 % |
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
<<<<<<< HEAD
100.00 % |
>>>>>>> 0832698 (Manifest_cache true)
<<<<<<< HEAD
=======
<<<<<<< HEAD
100.00 % |
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
100.00 % |
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
<<<<<<< HEAD
100.00 % |
>>>>>>> 3b839af (Manifest_cache true)
<<<<<<< HEAD
=======
<<<<<<< HEAD
100.00 % |
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
100.00 % |
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
<<<<<<< HEAD
100.00 % |
>>>>>>> 1bfc7a6 (Manifest_cache true)
<<<<<<< HEAD
=======
<<<<<<< HEAD
100.00 % |
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
100.00 % |
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
<<<<<<< HEAD
100.00 % |
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
=======
<<<<<<< HEAD
100.00 % |
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
100.00 % |
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
<<<<<<< HEAD
100.00 % |
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
=======
<<<<<<< HEAD
100.00 % |
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
100.00 % |
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
<<<<<<< HEAD
100.00 % |
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
=======
=======
=======
<<<<<<< HEAD
100.00 % |
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
100.00 % |
>>>>>>> 00f8b58 (Manifest_cache true)
<<<<<<< HEAD
100.00 % |
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
100.00 % |
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
100.00 % |
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
<<<<<<< HEAD
100.00 % |
>>>>>>> 24b58e6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
100.00 % |
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
100.00 % |
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
<<<<<<< HEAD
100.00 % |
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
=======
<<<<<<< HEAD
100.00 % |
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
100.00 % |
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
<<<<<<< HEAD
100.00 % |
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
=======
<<<<<<< HEAD
100.00 % |
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
100.00 % |
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
<<<<<<< HEAD
100.00 % |
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
=======
=======
=======
<<<<<<< HEAD
100.00 % |
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
100.00 % |
>>>>>>> 00f8b58 (Manifest_cache true)
<<<<<<< HEAD
100.00 % |
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
100.00 % |
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
100.00 % |
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
<<<<<<< HEAD
100.00 % |
>>>>>>> 24b58e6 (Manifest_cache true)
<<<<<<< HEAD
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 9bebee5 (Manifest_cache true)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 394c6f3 (Manifest_cache true)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 0b43b18 (Manifest_cache true)
=======
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 902b803 (Manifest_cache true)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> b763f5b (Manifest_cache true)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> be2f578 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
=======
<<<<<<< HEAD
100.00 % |
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
100.00 % |
>>>>>>> 00f8b58 (Manifest_cache true)
<<<<<<< HEAD
100.00 % |
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
100.00 % |
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
100.00 % |
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
<<<<<<< HEAD
100.00 % |
>>>>>>> 24b58e6 (Manifest_cache true)
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
=======
=======
<<<<<<< HEAD
>>>>>>> 715fac2 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 3dc272d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
>>>>>>> cde4834 (Manifest_cache true)
=======
>>>>>>> 3dc272d (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
36.84 % |
29 |
19 |
7 |
12 |
0.37 |
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> d96cf3b (Featire specs)
100.00 % |
29 |
<<<<<<< HEAD
=======
=======
100.00 % |
30 |
>>>>>>> 752f0c0 (Featire specs)
=======
100.00 % |
30 |
>>>>>>> 4e81ea2 (Featire specs)
=======
100.00 % |
30 |
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
19 |
19 |
0 |
1.00 |
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
=======
>>>>>>> bf554f4 (Rebased)
36.84 % |
29 |
19 |
7 |
12 |
0.37 |
<<<<<<< HEAD
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 56a05fb (Featire specs)
=======
>>>>>>> 6d21330 (Featire specs)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> bc0ff2c (Featire specs)
=======
>>>>>>> 9bf2aae (Featire specs)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
=======
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> 27e3351 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> d7fadcd (Featire specs)
=======
>>>>>>> 5ce1a6d (Featire specs)
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> 4552227 (Featire specs)
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
=======
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 848bfa2 (Featire specs)
=======
=======
>>>>>>> 64d4167 (Featire specs)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9ca3b84 (Featire specs)
=======
=======
>>>>>>> 4552227 (Featire specs)
>>>>>>> 94841b5 (Featire specs)
>>>>>>> fefbd35 (Featire specs)
=======
=======
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 56a05fb (Featire specs)
=======
=======
>>>>>>> a038b16 (Featire specs)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6d21330 (Featire specs)
=======
=======
>>>>>>> 4552227 (Featire specs)
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 27e3351 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 20256f8 (Featire specs)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> 64d4167 (Featire specs)
=======
=======
>>>>>>> 4552227 (Featire specs)
>>>>>>> 94841b5 (Featire specs)
>>>>>>> 13fd74f (Featire specs)
=======
=======
>>>>>>> e54ceb0 (Featire specs)
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> a038b16 (Featire specs)
=======
=======
>>>>>>> 4552227 (Featire specs)
>>>>>>> 5a0bcc7 (Featire specs)
>>>>>>> d7fadcd (Featire specs)
=======
=======
>>>>>>> 8577deb (Featire specs)
<<<<<<< HEAD
>>>>>>> bc0ff2c (Featire specs)
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> ebe5361 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9bf2aae (Featire specs)
=======
=======
>>>>>>> 4552227 (Featire specs)
>>>>>>> d3d58e0 (Featire specs)
>>>>>>> 5ce1a6d (Featire specs)
100.00 % |
30 |
19 |
19 |
0 |
1.00 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> 56a05fb (Featire specs)
=======
>>>>>>> 6d21330 (Featire specs)
=======
>>>>>>> 27e3351 (Featire specs)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> d7fadcd (Featire specs)
=======
>>>>>>> bc0ff2c (Featire specs)
=======
>>>>>>> 9bf2aae (Featire specs)
=======
>>>>>>> 5ce1a6d (Featire specs)
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> 848bfa2 (Featire specs)
=======
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> 9ca3b84 (Featire specs)
=======
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> fefbd35 (Featire specs)
=======
=======
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 56a05fb (Featire specs)
=======
=======
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6d21330 (Featire specs)
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 27e3351 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 20256f8 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> ed6aebd (Featire specs)
=======
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> 64d4167 (Featire specs)
=======
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> 13fd74f (Featire specs)
=======
=======
>>>>>>> e54ceb0 (Featire specs)
>>>>>>> ea0650c (Featire specs)
=======
=======
>>>>>>> 95ebdc2 (Featire specs)
>>>>>>> a038b16 (Featire specs)
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
>>>>>>> d7fadcd (Featire specs)
=======
=======
>>>>>>> 8577deb (Featire specs)
<<<<<<< HEAD
>>>>>>> bc0ff2c (Featire specs)
=======
=======
>>>>>>> ebe5361 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9bf2aae (Featire specs)
=======
=======
>>>>>>> d3d58e0 (Featire specs)
>>>>>>> 5ce1a6d (Featire specs)
>>>>>>> 752f0c0 (Featire specs)
=======
36.84 % |
29 |
19 |
7 |
12 |
0.37 |
>>>>>>> bd8bda4 (Manifest_cache true)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
36.84 % |
29 |
19 |
7 |
12 |
0.37 |
>>>>>>> aa7b40c (Manifest_cache true)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> caaaa41 (Manifest_cache true)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> d70f030 (Manifest_cache true)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> ed97c39 (Manifest_cache true)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> d1bae53 (Manifest_cache true)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> 10b6c72 (Manifest_cache true)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> d96cf3b (Featire specs)
=======
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
=======
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> add330c (Manifest_cache true)
=======
>>>>>>> 56a05fb (Featire specs)
=======
>>>>>>> 23e9df9 (Manifest_cache true)
=======
>>>>>>> bc0ff2c (Featire specs)
=======
>>>>>>> 07682bd (Manifest_cache true)
>>>>>>> 5c33a07 (Featire specs)
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> b459807 (Manifest_cache true)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> add330c (Manifest_cache true)
=======
>>>>>>> 5c33a07 (Featire specs)
=======
=======
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1bfc7a6 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 23e9df9 (Manifest_cache true)
=======
>>>>>>> 5c33a07 (Featire specs)
=======
=======
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 94d9078 (Manifest_cache true)
=======
>>>>>>> 07682bd (Manifest_cache true)
36.84 % |
29 |
19 |
7 |
12 |
0.37 |
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b459807 (Manifest_cache true)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> add330c (Manifest_cache true)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> 23e9df9 (Manifest_cache true)
=======
>>>>>>> da83d1a (Fix book_spec decrease quantity and price)
=======
>>>>>>> 07682bd (Manifest_cache true)
=======
>>>>>>> 45f6de0 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c033601 (Rebased)
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> c8cdb08 (Manifest_cache true)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> 7c4ea7f (Fix)
=======
>>>>>>> 864f339 (Featire specs)
=======
>>>>>>> b5f64c6 (Manifest_cache true)
=======
>>>>>>> a2de409 (Featire specs)
=======
>>>>>>> 8c7bad7 (Manifest_cache true)
=======
>>>>>>> 8f1bc14 (Fix)
=======
>>>>>>> c1749d5 (Featire specs)
=======
>>>>>>> 3c386ca (Manifest_cache true)
=======
>>>>>>> 1cb2e82 (Featire specs)
=======
>>>>>>> fe7e312 (Manifest_cache true)
=======
>>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
100.00 % |
<<<<<<< HEAD
29 |
=======
30 |
>>>>>>> d0dc1f1 (Featire specs)
=======
36.84 % |
29 |
>>>>>>> 02a399d (Manifest_cache true)
19 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
19 |
0 |
1.00 |
<<<<<<< HEAD
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> f764a87 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> d780a52 (Rebased)
=======
=======
7 |
12 |
0.37 |
>>>>>>> b9cc4e9 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d0f5c14 (Manifest_cache true)
=======
=======
7 |
12 |
0.37 |
=======
19 |
0 |
1.00 |
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
36.84 % |
29 |
19 |
7 |
12 |
0.37 |
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6fa625b (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> cfd1f7f (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
100.00 % |
30 |
19 |
19 |
0 |
1.00 |
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
=======
=======
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
36.84 % |
29 |
19 |
7 |
12 |
0.37 |
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8cdb08 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e031bce (Manifest_cache true)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 12bcf81 (Featire specs)
=======
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
36.84 % |
29 |
19 |
7 |
12 |
0.37 |
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 02ba384 (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3e35e (Featire specs)
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 926dfe5 (Manifest_cache true)
=======
=======
=======
100.00 % |
29 |
<<<<<<< HEAD
=======
=======
100.00 % |
30 |
>>>>>>> 752f0c0 (Featire specs)
=======
100.00 % |
30 |
>>>>>>> 4e81ea2 (Featire specs)
=======
100.00 % |
30 |
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
19 |
19 |
0 |
1.00 |
<<<<<<< HEAD
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c54769d (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 1677b1a (Featire specs)
=======
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 1bfc7a6 (Manifest_cache true)
=======
36.84 % |
29 |
19 |
7 |
12 |
0.37 |
<<<<<<< HEAD
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 00f8b58 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1830ff1 (Manifest_cache true)
=======
=======
=======
100.00 % |
29 |
<<<<<<< HEAD
=======
=======
100.00 % |
30 |
>>>>>>> 752f0c0 (Featire specs)
=======
100.00 % |
30 |
>>>>>>> 4e81ea2 (Featire specs)
=======
100.00 % |
30 |
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
19 |
19 |
0 |
1.00 |
<<<<<<< HEAD
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c346782 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
>>>>>>> d52ad35 (Rebased)
=======
=======
100.00 % |
29 |
19 |
19 |
0 |
1.00 |
>>>>>>> a5d032d (Fix)
>>>>>>> b28889f (Fix)
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
=======
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> caaaa41 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> d70f030 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 10b6c72 (Manifest_cache true)
=======
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c033601 (Rebased)
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> c8cdb08 (Manifest_cache true)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> 7c4ea7f (Fix)
=======
>>>>>>> 864f339 (Featire specs)
=======
>>>>>>> b5f64c6 (Manifest_cache true)
=======
>>>>>>> a2de409 (Featire specs)
=======
>>>>>>> 8c7bad7 (Manifest_cache true)
=======
>>>>>>> 8f1bc14 (Fix)
100.00 % |
<<<<<<< HEAD
29 |
=======
30 |
>>>>>>> d0dc1f1 (Featire specs)
=======
36.84 % |
29 |
>>>>>>> 02a399d (Manifest_cache true)
19 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
19 |
0 |
1.00 |
<<<<<<< HEAD
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> ee78f39 (Rebased)
=======
=======
7 |
12 |
0.37 |
>>>>>>> b9cc4e9 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 7945032 (Manifest_cache true)
=======
=======
7 |
12 |
0.37 |
=======
7 |
12 |
0.37 |
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
7 |
12 |
0.37 |
>>>>>>> 4e7b845 (Manifest_cache true)
=======
7 |
12 |
0.37 |
>>>>>>> b8aab1a (Manifest_cache true)
=======
19 |
0 |
1.00 |
=======
=======
>>>>>>> 3dc272d (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> 715fac2 (Featire specs)
=======
36.84 % |
29 |
19 |
7 |
12 |
0.37 |
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6fa625b (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0bdcc5e (Manifest_cache true)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
=======
=======
>>>>>>> 864f339 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> a2de409 (Featire specs)
=======
=======
>>>>>>> c1749d5 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 1cb2e82 (Featire specs)
100.00 % |
30 |
19 |
19 |
0 |
1.00 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> a2de409 (Featire specs)
=======
>>>>>>> 1cb2e82 (Featire specs)
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 563720e (Featire specs)
=======
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
<<<<<<< HEAD
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> b5f64c6 (Manifest_cache true)
>>>>>>> 036bb32 (Manifest_cache true)
=======
>>>>>>> 3c386ca (Manifest_cache true)
=======
36.84 % |
29 |
19 |
7 |
12 |
0.37 |
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8cdb08 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b00b319 (Manifest_cache true)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9bf83f (Featire specs)
=======
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
<<<<<<< HEAD
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> 8c7bad7 (Manifest_cache true)
>>>>>>> 3e8974a (Manifest_cache true)
=======
>>>>>>> fe7e312 (Manifest_cache true)
=======
36.84 % |
29 |
19 |
7 |
12 |
0.37 |
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 86d584a (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b459807 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
100.00 % |
<<<<<<< HEAD
29 |
=======
30 |
>>>>>>> d0dc1f1 (Featire specs)
=======
36.84 % |
29 |
>>>>>>> 02a399d (Manifest_cache true)
19 |
<<<<<<< HEAD
=======
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7b112c2 (Fix book_spec decrease quantity and price)
=======
100.00 % |
29 |
19 |
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7b112c2 (Fix book_spec decrease quantity and price)
19 |
0 |
1.00 |
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
36.84 % |
29 |
19 |
7 |
12 |
0.37 |
<<<<<<< HEAD
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 00f8b58 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 866aee4 (Manifest_cache true)
100.00 % |
<<<<<<< HEAD
29 |
=======
30 |
>>>>>>> d0dc1f1 (Featire specs)
=======
36.84 % |
29 |
>>>>>>> 02a399d (Manifest_cache true)
19 |
<<<<<<< HEAD
19 |
0 |
1.00 |
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
>>>>>>> 49e8a6c (Rebased)
=======
=======
=======
>>>>>>> e991554 (Manifest_cache true)
100.00 % |
<<<<<<< HEAD
29 |
=======
30 |
>>>>>>> d0dc1f1 (Featire specs)
=======
36.84 % |
29 |
>>>>>>> 02a399d (Manifest_cache true)
19 |
<<<<<<< HEAD
19 |
0 |
1.00 |
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> 872e675 (Fix)
=======
=======
7 |
12 |
0.37 |
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 35d17b9 (Manifest_cache true)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> add330c (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
=======
>>>>>>> 3b839af (Manifest_cache true)
=======
36.84 % |
29 |
19 |
7 |
12 |
0.37 |
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 15bff2e (Manifest_cache true)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
=======
36.84 % |
29 |
19 |
7 |
12 |
0.37 |
>>>>>>> 998f08d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 6c71f00 (Manifest_cache true)
=======
=======
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
=======
>>>>>>> 59078f6 (Fix book_spec decrease quantity and price)
=======
100.00 % |
29 |
19 |
19 |
0 |
1.00 |
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
>>>>>>> 1d59aaa (Fix)
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 715fac2 (Featire specs)
=======
=======
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ed97c39 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> d1bae53 (Manifest_cache true)
=======
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c033601 (Rebased)
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> c8cdb08 (Manifest_cache true)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> 7c4ea7f (Fix)
100.00 % |
<<<<<<< HEAD
29 |
=======
30 |
>>>>>>> d0dc1f1 (Featire specs)
=======
36.84 % |
29 |
>>>>>>> 02a399d (Manifest_cache true)
19 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
19 |
0 |
1.00 |
<<<<<<< HEAD
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> 836a973 (Rebased)
=======
=======
>>>>>>> ab67c96 (Manifest_cache true)
=======
7 |
12 |
0.37 |
<<<<<<< HEAD
>>>>>>> b9cc4e9 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 9bebee5 (Manifest_cache true)
=======
=======
7 |
12 |
0.37 |
=======
7 |
12 |
0.37 |
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
7 |
12 |
0.37 |
>>>>>>> 4e7b845 (Manifest_cache true)
=======
19 |
0 |
1.00 |
=======
>>>>>>> 3dc272d (Featire specs)
=======
36.84 % |
29 |
19 |
7 |
12 |
0.37 |
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6fa625b (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> ee5935f (Manifest_cache true)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
=======
=======
>>>>>>> 864f339 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> a2de409 (Featire specs)
100.00 % |
30 |
19 |
19 |
0 |
1.00 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> a2de409 (Featire specs)
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 3e9f99d (Featire specs)
=======
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
<<<<<<< HEAD
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3dc272d (Featire specs)
=======
>>>>>>> b5f64c6 (Manifest_cache true)
>>>>>>> b746b60 (Manifest_cache true)
=======
36.84 % |
29 |
19 |
7 |
12 |
0.37 |
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8cdb08 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 394c6f3 (Manifest_cache true)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5be567f (Featire specs)
=======
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
<<<<<<< HEAD
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 3dc272d (Featire specs)
=======
>>>>>>> 8c7bad7 (Manifest_cache true)
>>>>>>> e965665 (Manifest_cache true)
=======
36.84 % |
29 |
19 |
7 |
12 |
0.37 |
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0b43b18 (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 2ee03d3 (Featire specs)
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> caaaa41 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
100.00 % |
<<<<<<< HEAD
29 |
=======
30 |
>>>>>>> d0dc1f1 (Featire specs)
=======
36.84 % |
29 |
>>>>>>> 02a399d (Manifest_cache true)
19 |
<<<<<<< HEAD
=======
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
=======
100.00 % |
29 |
19 |
<<<<<<< HEAD
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
19 |
0 |
1.00 |
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5506bd0 (Featire specs)
=======
=======
=======
36.84 % |
29 |
19 |
7 |
12 |
0.37 |
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 00f8b58 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8874887 (Manifest_cache true)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 866aee4 (Manifest_cache true)
100.00 % |
<<<<<<< HEAD
29 |
=======
30 |
>>>>>>> d0dc1f1 (Featire specs)
=======
36.84 % |
29 |
>>>>>>> 02a399d (Manifest_cache true)
19 |
<<<<<<< HEAD
19 |
0 |
1.00 |
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
>>>>>>> 078304c (Rebased)
=======
=======
100.00 % |
29 |
19 |
19 |
0 |
1.00 |
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> d15fe1d (Fix)
=======
=======
7 |
12 |
0.37 |
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> dcf74e1 (Manifest_cache true)
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d66884b (Manifest_cache true)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> bcd09ab (Featire specs)
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 022e63e (Manifest_cache true)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> c006a44 (Featire specs)
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 10bdfea (Manifest_cache true)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 848bfa2 (Featire specs)
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d70f030 (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9ca3b84 (Featire specs)
=======
=======
=======
>>>>>>> 3b839af (Manifest_cache true)
=======
36.84 % |
29 |
19 |
7 |
12 |
0.37 |
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> cae047f (Manifest_cache true)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> fefbd35 (Featire specs)
=======
=======
=======
36.84 % |
29 |
19 |
7 |
12 |
0.37 |
>>>>>>> 998f08d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a9e654b (Manifest_cache true)
=======
=======
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
=======
100.00 % |
29 |
19 |
19 |
0 |
1.00 |
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
>>>>>>> 0b5b269 (Fix)
=======
>>>>>>> 866aee4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> ab67c96 (Manifest_cache true)
=======
=======
>>>>>>> 4e7b845 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4e0a8d9 (Manifest_cache true)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
>>>>>>> f5da5ac (Featire specs)
=======
=======
>>>>>>> b5f64c6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 036bb32 (Manifest_cache true)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5f79779 (Featire specs)
=======
=======
>>>>>>> 8c7bad7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 3e8974a (Manifest_cache true)
=======
=======
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 56a05fb (Featire specs)
=======
=======
>>>>>>> 1bfc7a6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 23e9df9 (Manifest_cache true)
=======
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> da83d1a (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6d21330 (Featire specs)
=======
=======
>>>>>>> 3b839af (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 9617beb (Manifest_cache true)
=======
=======
=======
>>>>>>> a455e8a (Fix book_spec decrease quantity and price)
=======
100.00 % |
29 |
19 |
19 |
0 |
1.00 |
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2a431e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 27e3351 (Featire specs)
=======
=======
=======
>>>>>>> 9d9ff14 (Manifest_cache true)
=======
36.84 % |
29 |
19 |
7 |
12 |
0.37 |
>>>>>>> 998f08d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0832698 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b40a04e (Manifest_cache true)
=======
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e733663 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 8f1bc14 (Fix)
<<<<<<< HEAD
>>>>>>> 1ac6be1 (Fix)
=======
>>>>>>> cde4834 (Manifest_cache true)
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 3dc272d (Featire specs)
=======
=======
=======
>>>>>>> c033601 (Rebased)
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> c8cdb08 (Manifest_cache true)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
100.00 % |
<<<<<<< HEAD
29 |
=======
30 |
>>>>>>> d0dc1f1 (Featire specs)
=======
36.84 % |
29 |
>>>>>>> 02a399d (Manifest_cache true)
19 |
<<<<<<< HEAD
<<<<<<< HEAD
19 |
0 |
1.00 |
<<<<<<< HEAD
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> 1577aeb (Rebased)
=======
=======
>>>>>>> 6edce20 (Manifest_cache true)
=======
7 |
12 |
0.37 |
<<<<<<< HEAD
>>>>>>> b9cc4e9 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 902b803 (Manifest_cache true)
=======
=======
7 |
12 |
0.37 |
=======
7 |
12 |
0.37 |
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
19 |
0 |
1.00 |
=======
36.84 % |
29 |
19 |
7 |
12 |
0.37 |
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6fa625b (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0c9131d (Manifest_cache true)
=======
=======
=======
<<<<<<< HEAD
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
100.00 % |
30 |
19 |
19 |
0 |
1.00 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 56ef3ac (Featire specs)
=======
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
36.84 % |
29 |
19 |
7 |
12 |
0.37 |
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8cdb08 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b763f5b (Manifest_cache true)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 113da87 (Featire specs)
=======
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
36.84 % |
29 |
19 |
7 |
12 |
0.37 |
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> be2f578 (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 8b420cf (Featire specs)
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> ed97c39 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
100.00 % |
<<<<<<< HEAD
29 |
=======
30 |
>>>>>>> d0dc1f1 (Featire specs)
=======
36.84 % |
29 |
>>>>>>> 02a399d (Manifest_cache true)
19 |
<<<<<<< HEAD
=======
=======
100.00 % |
29 |
19 |
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
19 |
0 |
1.00 |
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 20256f8 (Featire specs)
=======
=======
=======
36.84 % |
29 |
19 |
7 |
12 |
0.37 |
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 00f8b58 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 587ce47 (Manifest_cache true)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
100.00 % |
29 |
19 |
19 |
0 |
1.00 |
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
>>>>>>> bebaea7 (Rebased)
=======
=======
100.00 % |
29 |
19 |
19 |
0 |
1.00 |
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> eaef86a (Fix)
=======
=======
7 |
12 |
0.37 |
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 5518ff0 (Manifest_cache true)
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 75be480 (Manifest_cache true)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> a1fe6da (Featire specs)
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 027f794 (Manifest_cache true)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 28fed3c (Featire specs)
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e2bfd89 (Manifest_cache true)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ed6aebd (Featire specs)
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d1bae53 (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> 64d4167 (Featire specs)
=======
=======
=======
36.84 % |
29 |
19 |
7 |
12 |
0.37 |
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 35d9b13 (Manifest_cache true)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 13fd74f (Featire specs)
=======
=======
=======
36.84 % |
29 |
19 |
7 |
12 |
0.37 |
>>>>>>> 998f08d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7f7abc (Manifest_cache true)
=======
=======
=======
100.00 % |
29 |
19 |
19 |
0 |
1.00 |
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1a9aba9 (Fix)
=======
=======
7 |
12 |
0.37 |
>>>>>>> 866aee4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 459d812 (Manifest_cache true)
=======
=======
>>>>>>> 4e7b845 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 3fef583 (Manifest_cache true)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
>>>>>>> 93db8b1 (Featire specs)
=======
=======
>>>>>>> b5f64c6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b746b60 (Manifest_cache true)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5f76842 (Featire specs)
=======
=======
>>>>>>> 8c7bad7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e965665 (Manifest_cache true)
=======
=======
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
>>>>>>> ea0650c (Featire specs)
=======
=======
>>>>>>> 1bfc7a6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 10b6c72 (Manifest_cache true)
=======
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
>>>>>>> a038b16 (Featire specs)
=======
=======
>>>>>>> 3b839af (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a77cc8a (Manifest_cache true)
=======
=======
=======
100.00 % |
29 |
19 |
19 |
0 |
1.00 |
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
>>>>>>> d7fadcd (Featire specs)
=======
=======
=======
36.84 % |
29 |
19 |
7 |
12 |
0.37 |
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> 0832698 (Manifest_cache true)
>>>>>>> 39467b5 (Manifest_cache true)
=======
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 8f1bc14 (Fix)
>>>>>>> 49e3b70 (Fix)
=======
>>>>>>> e991554 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 6edce20 (Manifest_cache true)
=======
=======
>>>>>>> b8aab1a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 04108c4 (Manifest_cache true)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> c1749d5 (Featire specs)
<<<<<<< HEAD
>>>>>>> f861b82 (Featire specs)
=======
=======
>>>>>>> 3c386ca (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d8298a1 (Manifest_cache true)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 1cb2e82 (Featire specs)
<<<<<<< HEAD
>>>>>>> 2fd2048 (Featire specs)
=======
=======
>>>>>>> fe7e312 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> bdea3aa (Manifest_cache true)
=======
=======
>>>>>>> 8577deb (Featire specs)
<<<<<<< HEAD
>>>>>>> bc0ff2c (Featire specs)
=======
=======
>>>>>>> 94d9078 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 07682bd (Manifest_cache true)
=======
=======
>>>>>>> 7b112c2 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 45f6de0 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> ebe5361 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9bf2aae (Featire specs)
=======
=======
=======
36.84 % |
29 |
19 |
7 |
12 |
0.37 |
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 2956182 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e2d040a (Manifest_cache true)
=======
=======
>>>>>>> a455e8a (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 7718476 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 4552227 (Featire specs)
>>>>>>> d3d58e0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5ce1a6d (Featire specs)
=======
=======
>>>>>>> 9d9ff14 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 307ac6e (Manifest_cache true)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 59078f6 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> cea736b (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
| spec/support/configs/shoulda_matcher.rb |
100.00 % |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
8 |
=======
9 |
>>>>>>> cde4834 (Manifest_cache true)
=======
8 |
>>>>>>> 1577aeb (Rebased)
=======
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> a1fe6da (Featire specs)
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> 93db8b1 (Featire specs)
=======
>>>>>>> 5f76842 (Featire specs)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> d7fadcd (Featire specs)
=======
>>>>>>> f861b82 (Featire specs)
=======
>>>>>>> 2fd2048 (Featire specs)
=======
>>>>>>> bc0ff2c (Featire specs)
=======
>>>>>>> 9bf2aae (Featire specs)
=======
>>>>>>> 5ce1a6d (Featire specs)
8 |
=======
9 |
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8c32a77 (Featire specs)
=======
=======
9 |
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 56ef3ac (Featire specs)
=======
=======
9 |
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 113da87 (Featire specs)
=======
=======
9 |
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8b420cf (Featire specs)
=======
=======
9 |
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 20256f8 (Featire specs)
=======
8 |
>>>>>>> bebaea7 (Rebased)
=======
8 |
=======
9 |
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> b35d1f8 (Featire specs)
=======
=======
9 |
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> a1fe6da (Featire specs)
=======
=======
9 |
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 28fed3c (Featire specs)
=======
=======
9 |
>>>>>>> 08edf50 (Featire specs)
>>>>>>> ed6aebd (Featire specs)
=======
=======
9 |
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 64d4167 (Featire specs)
=======
=======
9 |
>>>>>>> 4552227 (Featire specs)
>>>>>>> 13fd74f (Featire specs)
=======
8 |
>>>>>>> 1a9aba9 (Fix)
=======
8 |
=======
9 |
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> dacfb20 (Featire specs)
=======
=======
9 |
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 93db8b1 (Featire specs)
=======
=======
9 |
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 5f76842 (Featire specs)
=======
=======
9 |
>>>>>>> 08edf50 (Featire specs)
>>>>>>> ea0650c (Featire specs)
=======
=======
9 |
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> a038b16 (Featire specs)
=======
=======
9 |
>>>>>>> 4552227 (Featire specs)
>>>>>>> d7fadcd (Featire specs)
=======
8 |
>>>>>>> 49e3b70 (Fix)
=======
8 |
=======
9 |
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 78d0719 (Featire specs)
=======
=======
9 |
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> f861b82 (Featire specs)
=======
=======
9 |
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 2fd2048 (Featire specs)
=======
=======
9 |
>>>>>>> 08edf50 (Featire specs)
>>>>>>> bc0ff2c (Featire specs)
=======
=======
9 |
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9bf2aae (Featire specs)
=======
=======
9 |
>>>>>>> 4552227 (Featire specs)
>>>>>>> 5ce1a6d (Featire specs)
=======
8 |
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
5 |
5 |
0 |
1.00 |
| spec/support/configs/sidekiq.rb |
100.00 % |
3 |
2 |
2 |
0 |
1.00 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 9bebee5 (Manifest_cache true)
=======
>>>>>>> ee5935f (Manifest_cache true)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 394c6f3 (Manifest_cache true)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 0b43b18 (Manifest_cache true)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> caaaa41 (Manifest_cache true)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> 8874887 (Manifest_cache true)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 078304c (Rebased)
=======
>>>>>>> b4763a2 (Featire specs)
=======
>>>>>>> dcf74e1 (Manifest_cache true)
=======
>>>>>>> d66884b (Manifest_cache true)
=======
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> 022e63e (Manifest_cache true)
=======
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 10bdfea (Manifest_cache true)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> d70f030 (Manifest_cache true)
=======
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> cae047f (Manifest_cache true)
=======
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> a9e654b (Manifest_cache true)
=======
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0b5b269 (Fix)
=======
>>>>>>> d6f7da8 (Featire specs)
=======
>>>>>>> ab67c96 (Manifest_cache true)
=======
>>>>>>> 4e0a8d9 (Manifest_cache true)
=======
>>>>>>> f5da5ac (Featire specs)
=======
>>>>>>> 036bb32 (Manifest_cache true)
=======
>>>>>>> 5f79779 (Featire specs)
=======
>>>>>>> 3e8974a (Manifest_cache true)
=======
>>>>>>> 56a05fb (Featire specs)
=======
>>>>>>> 23e9df9 (Manifest_cache true)
=======
>>>>>>> da83d1a (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6d21330 (Featire specs)
=======
>>>>>>> 9617beb (Manifest_cache true)
=======
>>>>>>> a2a431e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 27e3351 (Featire specs)
=======
>>>>>>> b40a04e (Manifest_cache true)
=======
>>>>>>> e733663 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1ac6be1 (Fix)
=======
>>>>>>> 3dc272d (Featire specs)
=======
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 902b803 (Manifest_cache true)
=======
>>>>>>> 0c9131d (Manifest_cache true)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> b763f5b (Manifest_cache true)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> be2f578 (Manifest_cache true)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> ed97c39 (Manifest_cache true)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 587ce47 (Manifest_cache true)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
>>>>>>> bebaea7 (Rebased)
=======
>>>>>>> b35d1f8 (Featire specs)
=======
>>>>>>> 5518ff0 (Manifest_cache true)
=======
>>>>>>> 75be480 (Manifest_cache true)
=======
>>>>>>> a1fe6da (Featire specs)
=======
>>>>>>> 027f794 (Manifest_cache true)
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> e2bfd89 (Manifest_cache true)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> d1bae53 (Manifest_cache true)
=======
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> 35d9b13 (Manifest_cache true)
=======
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> f7f7abc (Manifest_cache true)
=======
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1a9aba9 (Fix)
=======
>>>>>>> dacfb20 (Featire specs)
=======
>>>>>>> 459d812 (Manifest_cache true)
=======
>>>>>>> 3fef583 (Manifest_cache true)
=======
>>>>>>> 93db8b1 (Featire specs)
=======
>>>>>>> b746b60 (Manifest_cache true)
=======
>>>>>>> 5f76842 (Featire specs)
=======
>>>>>>> e965665 (Manifest_cache true)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> 10b6c72 (Manifest_cache true)
=======
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> a77cc8a (Manifest_cache true)
=======
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d7fadcd (Featire specs)
=======
>>>>>>> 39467b5 (Manifest_cache true)
=======
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 49e3b70 (Fix)
=======
>>>>>>> 78d0719 (Featire specs)
=======
>>>>>>> 6edce20 (Manifest_cache true)
=======
>>>>>>> 04108c4 (Manifest_cache true)
=======
>>>>>>> f861b82 (Featire specs)
=======
>>>>>>> d8298a1 (Manifest_cache true)
=======
>>>>>>> 2fd2048 (Featire specs)
=======
>>>>>>> bdea3aa (Manifest_cache true)
=======
>>>>>>> bc0ff2c (Featire specs)
=======
>>>>>>> 07682bd (Manifest_cache true)
=======
>>>>>>> 45f6de0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9bf2aae (Featire specs)
=======
>>>>>>> e2d040a (Manifest_cache true)
=======
>>>>>>> 7718476 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5ce1a6d (Featire specs)
=======
>>>>>>> 307ac6e (Manifest_cache true)
=======
>>>>>>> cea736b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 715fac2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 3dc272d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 7945032 (Manifest_cache true)
=======
=======
>>>>>>> 6fa625b (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0bdcc5e (Manifest_cache true)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 563720e (Featire specs)
=======
=======
>>>>>>> c8cdb08 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b00b319 (Manifest_cache true)
=======
=======
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9bf83f (Featire specs)
=======
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 86d584a (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b459807 (Manifest_cache true)
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
=======
>>>>>>> 00f8b58 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
>>>>>>> 49e8a6c (Rebased)
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 35d17b9 (Manifest_cache true)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> add330c (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 15bff2e (Manifest_cache true)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 6c71f00 (Manifest_cache true)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
=======
=======
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
>>>>>>> 5c33a07 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> a636fda (Featire specs)
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
>>>>>>> 6fa625b (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> c8cdb08 (Manifest_cache true)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
>>>>>>> bf554f4 (Rebased)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> b15044a (Manifest_cache true)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7c4ea7f (Fix)
=======
>>>>>>> 9dc109d (Featire specs)
=======
>>>>>>> 866aee4 (Manifest_cache true)
=======
>>>>>>> 4e7b845 (Manifest_cache true)
=======
>>>>>>> 864f339 (Featire specs)
=======
>>>>>>> b5f64c6 (Manifest_cache true)
=======
>>>>>>> a2de409 (Featire specs)
=======
>>>>>>> 8c7bad7 (Manifest_cache true)
=======
>>>>>>> e54ceb0 (Featire specs)
=======
>>>>>>> 1bfc7a6 (Manifest_cache true)
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
>>>>>>> 3b839af (Manifest_cache true)
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5a0bcc7 (Featire specs)
=======
>>>>>>> 0832698 (Manifest_cache true)
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8f1bc14 (Fix)
=======
=======
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
>>>>>>> 5c33a07 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> a636fda (Featire specs)
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
>>>>>>> 6fa625b (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> c8cdb08 (Manifest_cache true)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
>>>>>>> bf554f4 (Rebased)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> b15044a (Manifest_cache true)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7c4ea7f (Fix)
=======
>>>>>>> 9dc109d (Featire specs)
=======
>>>>>>> 866aee4 (Manifest_cache true)
=======
>>>>>>> 4e7b845 (Manifest_cache true)
=======
>>>>>>> 864f339 (Featire specs)
=======
>>>>>>> b5f64c6 (Manifest_cache true)
=======
>>>>>>> a2de409 (Featire specs)
=======
>>>>>>> 8c7bad7 (Manifest_cache true)
=======
>>>>>>> e54ceb0 (Featire specs)
=======
>>>>>>> 1bfc7a6 (Manifest_cache true)
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
>>>>>>> 3b839af (Manifest_cache true)
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5a0bcc7 (Featire specs)
=======
>>>>>>> 0832698 (Manifest_cache true)
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8f1bc14 (Fix)
=======
>>>>>>> 65f3409 (Featire specs)
=======
>>>>>>> e991554 (Manifest_cache true)
=======
>>>>>>> b8aab1a (Manifest_cache true)
=======
>>>>>>> c1749d5 (Featire specs)
=======
>>>>>>> 3c386ca (Manifest_cache true)
=======
>>>>>>> 1cb2e82 (Featire specs)
=======
>>>>>>> fe7e312 (Manifest_cache true)
=======
>>>>>>> 8577deb (Featire specs)
=======
>>>>>>> 94d9078 (Manifest_cache true)
=======
>>>>>>> 7b112c2 (Fix book_spec decrease quantity and price)
=======
>>>>>>> ebe5361 (Featire specs)
=======
>>>>>>> 2956182 (Manifest_cache true)
=======
>>>>>>> a455e8a (Fix book_spec decrease quantity and price)
=======
>>>>>>> d3d58e0 (Featire specs)
=======
>>>>>>> 9d9ff14 (Manifest_cache true)
=======
>>>>>>> 59078f6 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
-
1
ActiveAdmin.register AdminUser do
-
1
permit_params :email, :password, :password_confirmation
-
-
1
index do
-
selectable_column
-
id_column
-
column :email
-
column :current_sign_in_at
-
column :sign_in_count
-
column :created_at
-
actions
-
end
-
-
1
filter :email
-
1
filter :current_sign_in_at
-
1
filter :sign_in_count
-
1
filter :created_at
-
-
1
form do |f|
-
f.inputs do
-
f.input :email
-
f.input :password
-
f.input :password_confirmation
-
end
-
f.actions
-
end
-
end
-
1
ActiveAdmin.register Author do
-
1
config.filters = true
-
1
permit_params :first_name, :last_name
-
-
1
filter :books, collection: Book.all
-
1
filter :first_name
-
1
filter :last_name
-
-
1
index do
-
3
selectable_column
-
-
3
column :first_name
-
3
column :last_name
-
-
3
actions
-
end
-
-
1
show do
-
3
attributes_table do
-
3
row :first_name
-
3
row :last_name
-
3
row :books
-
end
-
end
-
-
1
form do |f|
-
2
f.inputs do
-
2
f.input :first_name
-
2
f.input :last_name
-
-
2
f.input :books, as: :select, collection: Book.all
-
end
-
-
2
f.actions
-
end
-
end
-
1
ActiveAdmin.register Book do
-
1
permit_params :title, :description, :price_cents, :dimensions, :year_of_publication, :materials, :quantity,
-
author_ids: [], category_ids: [], images: []
-
-
1
decorate_with BookDecorator
-
-
1
filter :authors, collection: AuthorDecorator.decorate_collection(Author.all)
-
1
filter :categories
-
1
filter :title
-
1
filter :year_of_publication
-
-
1
index do
-
6
selectable_column
-
-
6
column :categories, &:categories_names
-
6
column :title
-
6
column :authors, &:authors_names
-
6
column :description
-
6
column :price, &:price
-
6
column :quantity
-
-
6
actions
-
end
-
-
1
show do
-
5
attributes_table do
-
5
row :authors, &:authors_names
-
5
row :categories, &:categories_names
-
5
row :year_of_publication
-
5
row :description
-
5
row :materials
-
5
row :dimensions
-
5
row :price, &:price
-
5
row :created_at
-
5
row :updated_at
-
end
-
-
5
panel :images do
-
5
table do
-
5
book.images.each do |image|
-
2
span image_tag image.variant(resize_to_limit: [100, 100])
-
end
-
end
-
end
-
end
-
-
1
form do |f|
-
6
f.inputs do
-
6
f.input :title
-
6
f.input :description
-
6
f.input :year_of_publication
-
6
f.input :price_cents
-
6
f.input :materials
-
6
f.input :dimensions
-
6
f.input :quantity
-
-
6
f.input :categories, as: :select, collection: Category.all
-
6
f.input :authors, as: :select, collection: AuthorDecorator.decorate_collection(Author.all)
-
6
f.input :images, as: :file, input_html: { multiple: true }
-
end
-
-
6
panel :images do
-
6
f.object.images.each do |image|
-
1
span image_tag image.variant(resize_to_limit: [100, 100])
-
1
span link_to('Delete', delete_image_admin_book_path(image.id), method: :delete,
-
data: { confirm: "Delete #{image.filename}?" })
-
end
-
end
-
-
6
f.actions
-
end
-
-
1
member_action :delete_image, method: :delete do
-
1
ActiveStorage::Attachment.find(params[:id]).purge_later
-
1
redirect_back(fallback_location: edit_admin_book_path)
-
end
-
end
-
1
ActiveAdmin.register Category do
-
1
permit_params :name, book_ids: []
-
-
1
filter :books, collection: Book.all
-
1
filter :name
-
-
1
index do
-
4
selectable_column
-
-
4
column :name
-
-
4
actions
-
end
-
-
1
show do
-
3
attributes_table do
-
3
row :name
-
3
row :created_at
-
3
row :updated_at
-
end
-
end
-
-
1
form do |f|
-
2
f.inputs do
-
2
f.input :name
-
2
f.input :books, as: :select, collection: Book.all
-
end
-
-
2
f.actions
-
end
-
end
-
1
ActiveAdmin.register Coupon do
-
1
permit_params :code, :is_active, :active_till_date, :discount, :order_id
-
-
1
index do
-
selectable_column
-
-
column :code
-
column :is_active
-
column :active_till_date
-
column :discount
-
-
actions
-
end
-
-
1
show do
-
attributes_table do
-
row :code
-
row :is_active
-
row :active_till_date
-
row :discount
-
row :order
-
end
-
end
-
-
1
form do |f|
-
f.inputs do
-
f.input :code
-
f.input :is_active
-
f.input :active_till_date
-
f.input :discount
-
f.input :order
-
end
-
-
f.actions
-
end
-
end
-
# frozen_string_literal: true
-
-
1
ActiveAdmin.register_page 'Dashboard' do
-
39
menu priority: 1, label: proc { I18n.t('active_admin.dashboard') }
-
-
1
action_item only: :show do
-
link_to 'SideKiq View', sidekiq_web_path
-
end
-
-
1
content title: proc { I18n.t('active_admin.dashboard') } do
-
div class: 'blank_slate_container', id: 'dashboard_default_message' do
-
span class: 'blank_slate' do
-
span I18n.t('active_admin.dashboard_welcome.welcome')
-
small I18n.t('active_admin.dashboard_welcome.call_to_action')
-
end
-
end
-
end
-
end
-
1
ActiveAdmin.register Delivery do
-
1
permit_params :price_cents, :delivery_method, :delivery_day
-
-
1
decorate_with DeliveryDecorator
-
-
1
index do
-
selectable_column
-
-
column :price_cents, &:price
-
column :delivery_method
-
column :delivery_day
-
-
actions
-
end
-
-
1
show do
-
attributes_table do
-
row :price_cents, &:price
-
row :delivery_method
-
row :delivery_day
-
end
-
end
-
-
1
form do |f|
-
f.inputs do
-
f.input :price_cents
-
f.input :delivery_method
-
f.input :delivery_day
-
end
-
-
f.actions
-
end
-
end
-
1
ActiveAdmin.register Order do
-
1
permit_params :user_id, :coupon_id, :address_id, :total_price, :status, :last_action
-
-
1
index do
-
selectable_column
-
-
column :user
-
column :coupon
-
column :total_price
-
column :status
-
column :updated_at
-
-
actions
-
end
-
-
1
show do
-
attributes_table do
-
row :user
-
row :coupon
-
row :total_price
-
row :status
-
row :delivery_id
-
row :updated_at
-
end
-
end
-
-
1
form do |f|
-
f.inputs do
-
f.input :user_id
-
f.input :coupon_id
-
f.input :total_price
-
f.input :status, as: :select, collection: %i[confirmed delivered canceled]
-
f.input :delivery_id
-
f.input :books
-
end
-
-
f.actions
-
end
-
end
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c033601 (Rebased)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
=======
=======
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6fa625b (Manifest_cache true)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
>>>>>>> bf554f4 (Rebased)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
=======
=======
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54deeb (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7c4ea7f (Fix)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9dc109d (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 864f339 (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> a2de409 (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54ceb0 (Featire specs)
=======
>>>>>>> 8f1bc14 (Fix)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 65f3409 (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> c1749d5 (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 1cb2e82 (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 8577deb (Featire specs)
=======
>>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
>>>>>>> 3dc272d (Featire specs)
-
1
<<<<<<< HEAD
ActiveAdmin.register AdminUser do
=======
class ApplicationController < ActionController::Base
-
1
before_action :user_or_guest_have_order
-
1
after_action :save_previous_path
-
-
1
private
-
-
1
def user_or_guest_have_order
-
185
if current_user && (session[:order_id].nil? || Order.where(id: session[:order_id]).empty?)
-
15
create_order_for_user
-
170
elsif session[:order_id].nil? || Order.where(id: session[:order_id]).empty?
-
55
create_order_for_guest
-
end
-
end
-
-
1
def create_order_for_user
-
15
session[:order_id] = Order.find_or_create_by(user_id: current_user.id, status: :initialized).id
-
15
CartCleanerJob.perform_in(3.days, session[:order_id])
-
end
-
-
1
def create_order_for_guest
-
55
session[:order_id] = Order.create.id
-
55
CartCleanerJob.perform_in(3.days, session[:order_id])
-
end
-
-
1
def save_previous_path
-
182
previous_path = request.path
-
182
session[:previous_path] = previous_path unless previous_path == request.url
-
end
-
end
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a5d032d (Fix)
-
1
class BooksController < ApplicationController
>>>>>>> 3dc272d (Featire specs)
-
1
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
permit_params :email, :password, :password_confirmation
=======
=======
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
>>>>>>> eaef86a (Fix)
=======
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
=======
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1a9aba9 (Fix)
<<<<<<< HEAD
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 20256f8 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 94841b5 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
PAGINATION_PER_PAGE = 12
>>>>>>> 3dc272d (Featire specs)
-
-
1
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
index do
=======
=======
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
>>>>>>> c033601 (Rebased)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a5d032d (Fix)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7c4ea7f (Fix)
def index
>>>>>>> 3dc272d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
-
=======
=======
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 65459e8 (Add login registration pages)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
>>>>>>> cb955a0 (Add login registration pages)
=======
>>>>>>> eaef86a (Fix)
=======
>>>>>>> b35d1f8 (Featire specs)
=======
>>>>>>> a1fe6da (Featire specs)
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
>>>>>>> b5affcb (Add login registration pages)
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4f7c979 (Add login registration pages)
=======
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
>>>>>>> 60943cc (Add login registration pages)
=======
>>>>>>> 1a9aba9 (Fix)
=======
>>>>>>> dacfb20 (Featire specs)
=======
>>>>>>> 93db8b1 (Featire specs)
=======
>>>>>>> 5f76842 (Featire specs)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> d7fadcd (Featire specs)
=======
>>>>>>> 49e3b70 (Fix)
=======
>>>>>>> 78d0719 (Featire specs)
=======
>>>>>>> f861b82 (Featire specs)
=======
>>>>>>> 2fd2048 (Featire specs)
=======
>>>>>>> bc0ff2c (Featire specs)
=======
>>>>>>> 9bf2aae (Featire specs)
=======
>>>>>>> 5ce1a6d (Featire specs)
=======
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 22ee41c (Add login registration pages)
-
24
<<<<<<< HEAD
=======
=======
-
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a624084 (Add login registration pages)
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6a9fede (Add login registration pages)
=======
>>>>>>> 7c4ea7f (Fix)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
>>>>>>> 5a0bcc7 (Featire specs)
=======
>>>>>>> 8f1bc14 (Fix)
=======
>>>>>>> ebe5361 (Featire specs)
=======
>>>>>>> d3d58e0 (Featire specs)
=======
>>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
-
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
25
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1214e1f (Add login registration pages)
=======
-
24
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> 3dc272d (Featire specs)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
-
24
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
-
25
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 22ee41c (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 27ceb6f (Add login registration pages)
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 864f339 (Featire specs)
=======
>>>>>>> a2de409 (Featire specs)
=======
>>>>>>> e54ceb0 (Featire specs)
=======
>>>>>>> c1749d5 (Featire specs)
=======
>>>>>>> 1cb2e82 (Featire specs)
=======
>>>>>>> 8577deb (Featire specs)
-
25
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> 1577aeb (Rebased)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
>>>>>>> cacbab9 (Add login registration pages)
-
25
=======
-
25
>>>>>>> 9620751 (Featire specs)
=======
-
25
>>>>>>> 9dc109d (Featire specs)
=======
-
25
>>>>>>> 65f3409 (Featire specs)
=======
-
24
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 8c32a77 (Featire specs)
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 864f339 (Featire specs)
=======
>>>>>>> c1749d5 (Featire specs)
=======
-
24
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 56ef3ac (Featire specs)
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> a2de409 (Featire specs)
=======
>>>>>>> 1cb2e82 (Featire specs)
=======
-
24
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 113da87 (Featire specs)
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> e54ceb0 (Featire specs)
=======
>>>>>>> 8577deb (Featire specs)
=======
-
24
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 8b420cf (Featire specs)
=======
=======
=======
-
24
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
=======
-
25
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 57a2e05 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 65459e8 (Add login registration pages)
=======
=======
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
>>>>>>> ebe5361 (Featire specs)
=======
-
24
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 20256f8 (Featire specs)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
-
24
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> a624084 (Add login registration pages)
=======
-
25
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> cacbab9 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> cb955a0 (Add login registration pages)
=======
=======
-
25
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> eaef86a (Fix)
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> b35d1f8 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> a1fe6da (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 28fed3c (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ed6aebd (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
<<<<<<< HEAD
>>>>>>> b5affcb (Add login registration pages)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> 64d4167 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> a624084 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 4f7c979 (Add login registration pages)
=======
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
=======
>>>>>>> d3d58e0 (Featire specs)
=======
-
24
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 13fd74f (Featire specs)
=======
=======
=======
-
24
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
=======
=======
-
25
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 6a9fede (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 60943cc (Add login registration pages)
=======
=======
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
>>>>>>> 1a9aba9 (Fix)
=======
=======
>>>>>>> 9dc109d (Featire specs)
<<<<<<< HEAD
>>>>>>> dacfb20 (Featire specs)
=======
=======
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
>>>>>>> 93db8b1 (Featire specs)
=======
=======
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5f76842 (Featire specs)
=======
=======
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
>>>>>>> ea0650c (Featire specs)
=======
=======
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
>>>>>>> a038b16 (Featire specs)
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
>>>>>>> d7fadcd (Featire specs)
=======
=======
>>>>>>> 8f1bc14 (Fix)
<<<<<<< HEAD
>>>>>>> 49e3b70 (Fix)
=======
=======
>>>>>>> 65f3409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 78d0719 (Featire specs)
=======
=======
>>>>>>> c1749d5 (Featire specs)
<<<<<<< HEAD
>>>>>>> f861b82 (Featire specs)
=======
=======
>>>>>>> 1cb2e82 (Featire specs)
<<<<<<< HEAD
>>>>>>> 2fd2048 (Featire specs)
=======
=======
>>>>>>> 8577deb (Featire specs)
<<<<<<< HEAD
>>>>>>> bc0ff2c (Featire specs)
=======
=======
>>>>>>> ebe5361 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9bf2aae (Featire specs)
=======
=======
>>>>>>> d3d58e0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5ce1a6d (Featire specs)
=======
=======
>>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
selectable_column
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
-
=======
=======
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 65459e8 (Add login registration pages)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
>>>>>>> cb955a0 (Add login registration pages)
=======
>>>>>>> eaef86a (Fix)
=======
>>>>>>> b35d1f8 (Featire specs)
=======
>>>>>>> a1fe6da (Featire specs)
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
>>>>>>> b5affcb (Add login registration pages)
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4f7c979 (Add login registration pages)
=======
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
>>>>>>> 60943cc (Add login registration pages)
=======
>>>>>>> 1a9aba9 (Fix)
=======
>>>>>>> dacfb20 (Featire specs)
=======
>>>>>>> 93db8b1 (Featire specs)
=======
>>>>>>> 5f76842 (Featire specs)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> d7fadcd (Featire specs)
=======
>>>>>>> 49e3b70 (Fix)
=======
>>>>>>> 78d0719 (Featire specs)
=======
>>>>>>> f861b82 (Featire specs)
=======
>>>>>>> 2fd2048 (Featire specs)
=======
>>>>>>> bc0ff2c (Featire specs)
=======
>>>>>>> 9bf2aae (Featire specs)
=======
>>>>>>> 5ce1a6d (Featire specs)
=======
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 22ee41c (Add login registration pages)
-
24
<<<<<<< HEAD
=======
=======
-
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a624084 (Add login registration pages)
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6a9fede (Add login registration pages)
=======
>>>>>>> 7c4ea7f (Fix)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
>>>>>>> 5a0bcc7 (Featire specs)
=======
>>>>>>> 8f1bc14 (Fix)
=======
>>>>>>> ebe5361 (Featire specs)
=======
>>>>>>> d3d58e0 (Featire specs)
=======
>>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
-
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
25
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1214e1f (Add login registration pages)
=======
-
24
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> 3dc272d (Featire specs)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
-
24
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
-
25
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 22ee41c (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 27ceb6f (Add login registration pages)
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 864f339 (Featire specs)
=======
>>>>>>> a2de409 (Featire specs)
=======
>>>>>>> e54ceb0 (Featire specs)
=======
>>>>>>> c1749d5 (Featire specs)
=======
>>>>>>> 1cb2e82 (Featire specs)
=======
>>>>>>> 8577deb (Featire specs)
-
25
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> 1577aeb (Rebased)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
>>>>>>> cacbab9 (Add login registration pages)
-
25
=======
-
25
>>>>>>> 9620751 (Featire specs)
=======
-
25
>>>>>>> 9dc109d (Featire specs)
=======
-
25
>>>>>>> 65f3409 (Featire specs)
=======
-
24
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 8c32a77 (Featire specs)
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 864f339 (Featire specs)
=======
>>>>>>> c1749d5 (Featire specs)
=======
-
24
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 56ef3ac (Featire specs)
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> a2de409 (Featire specs)
=======
>>>>>>> 1cb2e82 (Featire specs)
=======
-
24
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 113da87 (Featire specs)
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> e54ceb0 (Featire specs)
=======
>>>>>>> 8577deb (Featire specs)
=======
-
24
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 8b420cf (Featire specs)
=======
=======
=======
-
24
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
=======
-
25
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 57a2e05 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 65459e8 (Add login registration pages)
=======
=======
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
>>>>>>> ebe5361 (Featire specs)
=======
-
24
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 20256f8 (Featire specs)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
-
24
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> a624084 (Add login registration pages)
=======
-
25
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> cacbab9 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> cb955a0 (Add login registration pages)
=======
=======
-
25
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> eaef86a (Fix)
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> b35d1f8 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> a1fe6da (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 28fed3c (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ed6aebd (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
<<<<<<< HEAD
>>>>>>> b5affcb (Add login registration pages)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> 64d4167 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> a624084 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 4f7c979 (Add login registration pages)
=======
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
=======
>>>>>>> d3d58e0 (Featire specs)
=======
-
24
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 13fd74f (Featire specs)
=======
=======
=======
-
24
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
=======
=======
-
25
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 6a9fede (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 60943cc (Add login registration pages)
=======
=======
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
>>>>>>> 1a9aba9 (Fix)
=======
=======
>>>>>>> 9dc109d (Featire specs)
<<<<<<< HEAD
>>>>>>> dacfb20 (Featire specs)
=======
=======
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
>>>>>>> 93db8b1 (Featire specs)
=======
=======
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5f76842 (Featire specs)
=======
=======
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
>>>>>>> ea0650c (Featire specs)
=======
=======
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
>>>>>>> a038b16 (Featire specs)
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
>>>>>>> d7fadcd (Featire specs)
=======
=======
>>>>>>> 8f1bc14 (Fix)
<<<<<<< HEAD
>>>>>>> 49e3b70 (Fix)
=======
=======
>>>>>>> 65f3409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 78d0719 (Featire specs)
=======
=======
>>>>>>> c1749d5 (Featire specs)
<<<<<<< HEAD
>>>>>>> f861b82 (Featire specs)
=======
=======
>>>>>>> 1cb2e82 (Featire specs)
<<<<<<< HEAD
>>>>>>> 2fd2048 (Featire specs)
=======
=======
>>>>>>> 8577deb (Featire specs)
<<<<<<< HEAD
>>>>>>> bc0ff2c (Featire specs)
=======
=======
>>>>>>> ebe5361 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9bf2aae (Featire specs)
=======
=======
>>>>>>> d3d58e0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5ce1a6d (Featire specs)
=======
=======
>>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
id_column
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
-
=======
=======
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 65459e8 (Add login registration pages)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
>>>>>>> cb955a0 (Add login registration pages)
=======
>>>>>>> eaef86a (Fix)
=======
>>>>>>> b35d1f8 (Featire specs)
=======
>>>>>>> a1fe6da (Featire specs)
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
>>>>>>> b5affcb (Add login registration pages)
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4f7c979 (Add login registration pages)
=======
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
>>>>>>> 60943cc (Add login registration pages)
=======
>>>>>>> 1a9aba9 (Fix)
=======
>>>>>>> dacfb20 (Featire specs)
=======
>>>>>>> 93db8b1 (Featire specs)
=======
>>>>>>> 5f76842 (Featire specs)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> d7fadcd (Featire specs)
=======
>>>>>>> 49e3b70 (Fix)
=======
>>>>>>> 78d0719 (Featire specs)
=======
>>>>>>> f861b82 (Featire specs)
=======
>>>>>>> 2fd2048 (Featire specs)
=======
>>>>>>> bc0ff2c (Featire specs)
=======
>>>>>>> 9bf2aae (Featire specs)
=======
>>>>>>> 5ce1a6d (Featire specs)
=======
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
-
24
<<<<<<< HEAD
>>>>>>> 3dc272d (Featire specs)
=======
=======
=======
>>>>>>> 22ee41c (Add login registration pages)
-
24
=======
-
25
>>>>>>> 1214e1f (Add login registration pages)
=======
-
24
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
=======
=======
=======
-
25
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 22ee41c (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 27ceb6f (Add login registration pages)
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a624084 (Add login registration pages)
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6a9fede (Add login registration pages)
=======
>>>>>>> 864f339 (Featire specs)
=======
>>>>>>> a2de409 (Featire specs)
=======
>>>>>>> e54ceb0 (Featire specs)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
>>>>>>> 5a0bcc7 (Featire specs)
=======
>>>>>>> c1749d5 (Featire specs)
=======
>>>>>>> 1cb2e82 (Featire specs)
=======
>>>>>>> 8577deb (Featire specs)
=======
>>>>>>> ebe5361 (Featire specs)
=======
>>>>>>> d3d58e0 (Featire specs)
-
25
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> 1577aeb (Rebased)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
>>>>>>> cacbab9 (Add login registration pages)
-
25
=======
-
25
>>>>>>> 9620751 (Featire specs)
=======
-
25
>>>>>>> 9dc109d (Featire specs)
=======
-
25
>>>>>>> 65f3409 (Featire specs)
=======
-
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 8c32a77 (Featire specs)
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 864f339 (Featire specs)
=======
>>>>>>> c1749d5 (Featire specs)
=======
-
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 56ef3ac (Featire specs)
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> a2de409 (Featire specs)
=======
>>>>>>> 1cb2e82 (Featire specs)
=======
-
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 113da87 (Featire specs)
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> e54ceb0 (Featire specs)
=======
>>>>>>> 8577deb (Featire specs)
=======
-
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 8b420cf (Featire specs)
=======
=======
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
>>>>>>> ebe5361 (Featire specs)
=======
-
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 20256f8 (Featire specs)
=======
=======
-
25
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> eaef86a (Fix)
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> b35d1f8 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> a1fe6da (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 28fed3c (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ed6aebd (Featire specs)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> 64d4167 (Featire specs)
=======
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
=======
>>>>>>> d3d58e0 (Featire specs)
=======
-
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 13fd74f (Featire specs)
=======
=======
-
25
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
>>>>>>> 1a9aba9 (Fix)
=======
=======
>>>>>>> 9dc109d (Featire specs)
<<<<<<< HEAD
>>>>>>> dacfb20 (Featire specs)
=======
=======
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
>>>>>>> 93db8b1 (Featire specs)
=======
=======
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5f76842 (Featire specs)
=======
=======
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
>>>>>>> ea0650c (Featire specs)
=======
=======
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
>>>>>>> a038b16 (Featire specs)
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
>>>>>>> d7fadcd (Featire specs)
=======
=======
-
25
>>>>>>> 8f1bc14 (Fix)
<<<<<<< HEAD
>>>>>>> 49e3b70 (Fix)
=======
=======
>>>>>>> 65f3409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 78d0719 (Featire specs)
=======
=======
>>>>>>> c1749d5 (Featire specs)
<<<<<<< HEAD
>>>>>>> f861b82 (Featire specs)
=======
=======
>>>>>>> 1cb2e82 (Featire specs)
<<<<<<< HEAD
>>>>>>> 2fd2048 (Featire specs)
=======
=======
>>>>>>> 8577deb (Featire specs)
<<<<<<< HEAD
>>>>>>> bc0ff2c (Featire specs)
=======
=======
>>>>>>> ebe5361 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9bf2aae (Featire specs)
=======
=======
>>>>>>> d3d58e0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5ce1a6d (Featire specs)
=======
=======
-
25
>>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
column :email
=======
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> eaef86a (Fix)
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> 9620751 (Featire specs)
>>>>>>> b35d1f8 (Featire specs)
=======
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> 1a9aba9 (Fix)
=======
>>>>>>> dacfb20 (Featire specs)
=======
>>>>>>> 93db8b1 (Featire specs)
=======
>>>>>>> 5f76842 (Featire specs)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> d7fadcd (Featire specs)
=======
>>>>>>> 49e3b70 (Fix)
=======
>>>>>>> 78d0719 (Featire specs)
=======
>>>>>>> f861b82 (Featire specs)
=======
>>>>>>> 2fd2048 (Featire specs)
=======
>>>>>>> bc0ff2c (Featire specs)
=======
>>>>>>> 9bf2aae (Featire specs)
=======
>>>>>>> 5ce1a6d (Featire specs)
=======
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
<<<<<<< HEAD
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> a1fe6da (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 28fed3c (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ed6aebd (Featire specs)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> 64d4167 (Featire specs)
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 13fd74f (Featire specs)
=======
=======
>>>>>>> 9dc109d (Featire specs)
<<<<<<< HEAD
>>>>>>> dacfb20 (Featire specs)
=======
=======
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
>>>>>>> 93db8b1 (Featire specs)
=======
=======
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5f76842 (Featire specs)
=======
=======
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
>>>>>>> ea0650c (Featire specs)
=======
=======
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
>>>>>>> a038b16 (Featire specs)
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
>>>>>>> d7fadcd (Featire specs)
=======
=======
>>>>>>> 65f3409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 78d0719 (Featire specs)
=======
=======
>>>>>>> c1749d5 (Featire specs)
<<<<<<< HEAD
>>>>>>> f861b82 (Featire specs)
=======
=======
>>>>>>> 1cb2e82 (Featire specs)
<<<<<<< HEAD
>>>>>>> 2fd2048 (Featire specs)
=======
=======
>>>>>>> 8577deb (Featire specs)
<<<<<<< HEAD
>>>>>>> bc0ff2c (Featire specs)
=======
=======
>>>>>>> ebe5361 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9bf2aae (Featire specs)
=======
=======
>>>>>>> d3d58e0 (Featire specs)
>>>>>>> 5ce1a6d (Featire specs)
sorted_books = BookQuery.query(params).paginate(page: params[:page],
=======
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8c32a77 (Featire specs)
=======
=======
>>>>>>> b35d1f8 (Featire specs)
=======
>>>>>>> a1fe6da (Featire specs)
=======
>>>>>>> dacfb20 (Featire specs)
=======
>>>>>>> 93db8b1 (Featire specs)
=======
>>>>>>> 78d0719 (Featire specs)
=======
>>>>>>> f861b82 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 56ef3ac (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 113da87 (Featire specs)
=======
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> 5f76842 (Featire specs)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> 2fd2048 (Featire specs)
=======
>>>>>>> bc0ff2c (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8b420cf (Featire specs)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 20256f8 (Featire specs)
=======
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> d7fadcd (Featire specs)
=======
>>>>>>> 9bf2aae (Featire specs)
=======
>>>>>>> 5ce1a6d (Featire specs)
=======
sorted_books = BookQuery.query(params).paginate(page: params[:page],
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> eaef86a (Fix)
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> b35d1f8 (Featire specs)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> a1fe6da (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 28fed3c (Featire specs)
=======
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ed6aebd (Featire specs)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> 64d4167 (Featire specs)
=======
=======
=======
>>>>>>> 4552227 (Featire specs)
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 13fd74f (Featire specs)
=======
=======
sorted_books = BookQuery.query(params).paginate(page: params[:page],
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
>>>>>>> 1a9aba9 (Fix)
=======
=======
>>>>>>> 9dc109d (Featire specs)
<<<<<<< HEAD
>>>>>>> dacfb20 (Featire specs)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
>>>>>>> 93db8b1 (Featire specs)
=======
=======
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5f76842 (Featire specs)
=======
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
>>>>>>> ea0650c (Featire specs)
=======
=======
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
>>>>>>> a038b16 (Featire specs)
=======
=======
=======
>>>>>>> 4552227 (Featire specs)
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
>>>>>>> d7fadcd (Featire specs)
=======
=======
sorted_books = BookQuery.query(params).paginate(page: params[:page],
>>>>>>> 8f1bc14 (Fix)
<<<<<<< HEAD
>>>>>>> 49e3b70 (Fix)
=======
=======
>>>>>>> 65f3409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 78d0719 (Featire specs)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> c1749d5 (Featire specs)
<<<<<<< HEAD
>>>>>>> f861b82 (Featire specs)
=======
=======
>>>>>>> 1cb2e82 (Featire specs)
<<<<<<< HEAD
>>>>>>> 2fd2048 (Featire specs)
=======
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 8577deb (Featire specs)
<<<<<<< HEAD
>>>>>>> bc0ff2c (Featire specs)
=======
=======
>>>>>>> ebe5361 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9bf2aae (Featire specs)
=======
=======
=======
>>>>>>> 4552227 (Featire specs)
>>>>>>> d3d58e0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5ce1a6d (Featire specs)
=======
=======
sorted_books = BookQuery.query(params).paginate(page: params[:page],
>>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
-
=======
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> eaef86a (Fix)
=======
=======
>>>>>>> 9620751 (Featire specs)
>>>>>>> b35d1f8 (Featire specs)
=======
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> 1a9aba9 (Fix)
=======
>>>>>>> dacfb20 (Featire specs)
=======
>>>>>>> 93db8b1 (Featire specs)
=======
>>>>>>> 5f76842 (Featire specs)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> d7fadcd (Featire specs)
=======
>>>>>>> 49e3b70 (Fix)
=======
>>>>>>> 78d0719 (Featire specs)
=======
>>>>>>> f861b82 (Featire specs)
=======
>>>>>>> 2fd2048 (Featire specs)
=======
>>>>>>> bc0ff2c (Featire specs)
=======
>>>>>>> 9bf2aae (Featire specs)
=======
>>>>>>> 5ce1a6d (Featire specs)
=======
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> a1fe6da (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 28fed3c (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ed6aebd (Featire specs)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> 64d4167 (Featire specs)
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 13fd74f (Featire specs)
=======
=======
>>>>>>> 9dc109d (Featire specs)
<<<<<<< HEAD
>>>>>>> dacfb20 (Featire specs)
=======
=======
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
>>>>>>> 93db8b1 (Featire specs)
=======
=======
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5f76842 (Featire specs)
=======
=======
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
>>>>>>> ea0650c (Featire specs)
=======
=======
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
>>>>>>> a038b16 (Featire specs)
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
>>>>>>> d7fadcd (Featire specs)
=======
=======
>>>>>>> 65f3409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 78d0719 (Featire specs)
=======
=======
>>>>>>> c1749d5 (Featire specs)
<<<<<<< HEAD
>>>>>>> f861b82 (Featire specs)
=======
=======
>>>>>>> 1cb2e82 (Featire specs)
<<<<<<< HEAD
>>>>>>> 2fd2048 (Featire specs)
=======
=======
>>>>>>> 8577deb (Featire specs)
<<<<<<< HEAD
>>>>>>> bc0ff2c (Featire specs)
=======
=======
>>>>>>> ebe5361 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9bf2aae (Featire specs)
=======
=======
>>>>>>> d3d58e0 (Featire specs)
>>>>>>> 5ce1a6d (Featire specs)
-
>>>>>>> 1577aeb (Rebased)
=======
-
24
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 864f339 (Featire specs)
=======
>>>>>>> c1749d5 (Featire specs)
=======
-
24
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> a2de409 (Featire specs)
=======
>>>>>>> 1cb2e82 (Featire specs)
=======
-
24
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> e54ceb0 (Featire specs)
=======
>>>>>>> 8577deb (Featire specs)
=======
-
24
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
>>>>>>> ebe5361 (Featire specs)
=======
-
24
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
-
>>>>>>> a5d032d (Fix)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 3b03895 (Featire specs)
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
=======
>>>>>>> d3d58e0 (Featire specs)
=======
-
24
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
=======
-
>>>>>>> 7c4ea7f (Fix)
=======
>>>>>>> 9dc109d (Featire specs)
=======
>>>>>>> 864f339 (Featire specs)
=======
>>>>>>> a2de409 (Featire specs)
=======
>>>>>>> e54ceb0 (Featire specs)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
>>>>>>> 5a0bcc7 (Featire specs)
=======
-
>>>>>>> 8f1bc14 (Fix)
=======
>>>>>>> 65f3409 (Featire specs)
=======
>>>>>>> c1749d5 (Featire specs)
=======
>>>>>>> 1cb2e82 (Featire specs)
=======
>>>>>>> 8577deb (Featire specs)
=======
>>>>>>> ebe5361 (Featire specs)
=======
>>>>>>> d3d58e0 (Featire specs)
=======
-
>>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
column :current_sign_in_at
=======
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> eaef86a (Fix)
=======
=======
>>>>>>> 9620751 (Featire specs)
>>>>>>> b35d1f8 (Featire specs)
=======
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> 1a9aba9 (Fix)
=======
>>>>>>> dacfb20 (Featire specs)
=======
>>>>>>> 93db8b1 (Featire specs)
=======
>>>>>>> 5f76842 (Featire specs)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> d7fadcd (Featire specs)
=======
>>>>>>> 49e3b70 (Fix)
=======
>>>>>>> 78d0719 (Featire specs)
=======
>>>>>>> f861b82 (Featire specs)
=======
>>>>>>> 2fd2048 (Featire specs)
=======
>>>>>>> bc0ff2c (Featire specs)
=======
>>>>>>> 9bf2aae (Featire specs)
=======
>>>>>>> 5ce1a6d (Featire specs)
=======
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> a1fe6da (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 28fed3c (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ed6aebd (Featire specs)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> 64d4167 (Featire specs)
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 13fd74f (Featire specs)
=======
=======
>>>>>>> 9dc109d (Featire specs)
<<<<<<< HEAD
>>>>>>> dacfb20 (Featire specs)
=======
=======
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
>>>>>>> 93db8b1 (Featire specs)
=======
=======
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5f76842 (Featire specs)
=======
=======
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
>>>>>>> ea0650c (Featire specs)
=======
=======
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
>>>>>>> a038b16 (Featire specs)
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
>>>>>>> d7fadcd (Featire specs)
=======
=======
>>>>>>> 65f3409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 78d0719 (Featire specs)
=======
=======
>>>>>>> c1749d5 (Featire specs)
<<<<<<< HEAD
>>>>>>> f861b82 (Featire specs)
=======
=======
>>>>>>> 1cb2e82 (Featire specs)
<<<<<<< HEAD
>>>>>>> 2fd2048 (Featire specs)
=======
=======
>>>>>>> 8577deb (Featire specs)
<<<<<<< HEAD
>>>>>>> bc0ff2c (Featire specs)
=======
=======
>>>>>>> ebe5361 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9bf2aae (Featire specs)
=======
=======
>>>>>>> d3d58e0 (Featire specs)
>>>>>>> 5ce1a6d (Featire specs)
per_page: Constants::PAGINATION_PER_PAGE)
=======
@books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE)
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
@books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE)
>>>>>>> 752f0c0 (Featire specs)
=======
@books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE)
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
@books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE)
>>>>>>> 08edf50 (Featire specs)
=======
@books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE)
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
per_page: Constants::PAGINATION_PER_PAGE)
>>>>>>> a5d032d (Fix)
=======
>>>>>>> 9620751 (Featire specs)
=======
=======
@books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE)
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
=======
@books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE)
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 3b03895 (Featire specs)
=======
=======
@books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE)
>>>>>>> 4552227 (Featire specs)
>>>>>>> 94841b5 (Featire specs)
=======
per_page: Constants::PAGINATION_PER_PAGE)
>>>>>>> 7c4ea7f (Fix)
=======
>>>>>>> 9dc109d (Featire specs)
=======
=======
@books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE)
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 864f339 (Featire specs)
=======
>>>>>>> a2de409 (Featire specs)
=======
=======
@books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE)
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54ceb0 (Featire specs)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
=======
@books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE)
>>>>>>> 4552227 (Featire specs)
>>>>>>> 5a0bcc7 (Featire specs)
=======
per_page: Constants::PAGINATION_PER_PAGE)
>>>>>>> 8f1bc14 (Fix)
=======
>>>>>>> 65f3409 (Featire specs)
=======
=======
@books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE)
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> c1749d5 (Featire specs)
=======
>>>>>>> 1cb2e82 (Featire specs)
=======
=======
@books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE)
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 8577deb (Featire specs)
=======
>>>>>>> ebe5361 (Featire specs)
=======
=======
@books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE)
>>>>>>> 4552227 (Featire specs)
>>>>>>> d3d58e0 (Featire specs)
=======
per_page: Constants::PAGINATION_PER_PAGE)
>>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
-
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a5d032d (Fix)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> 7c4ea7f (Fix)
=======
>>>>>>> 9dc109d (Featire specs)
=======
>>>>>>> 864f339 (Featire specs)
=======
>>>>>>> a2de409 (Featire specs)
=======
>>>>>>> e54ceb0 (Featire specs)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
>>>>>>> 5a0bcc7 (Featire specs)
=======
>>>>>>> 8f1bc14 (Fix)
=======
>>>>>>> 65f3409 (Featire specs)
=======
>>>>>>> c1749d5 (Featire specs)
=======
>>>>>>> 1cb2e82 (Featire specs)
=======
>>>>>>> 8577deb (Featire specs)
=======
>>>>>>> ebe5361 (Featire specs)
=======
>>>>>>> d3d58e0 (Featire specs)
=======
>>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
-
25
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f182ac7 (Add login registration pages)
@books = BookDecorator.decorate_collection(sorted_books)
<<<<<<< HEAD
>>>>>>> 1577aeb (Rebased)
=======
=======
def index
-
25
@books_count = Book.count
-
25
@categories = Category.all
-
25
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
-
24
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
-
25
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
-
24
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a624084 (Add login registration pages)
=======
-
25
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f182ac7 (Add login registration pages)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a624084 (Add login registration pages)
=======
=======
-
24
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
=======
-
25
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 6a9fede (Add login registration pages)
sorted_books = BookQuery.query(params).paginate(page: params[:page],
-
per_page: PAGINATION_PER_PAGE)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 2471c87 (Add login registration pages)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
@books = BookDecorator.decorate_collection(sorted_books)
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> eaef86a (Fix)
=======
=======
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> f182ac7 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> aeec696 (Add login registration pages)
=======
=======
>>>>>>> 1214e1f (Add login registration pages)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
=======
@books = BookDecorator.decorate_collection(sorted_books)
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1a9aba9 (Fix)
<<<<<<< HEAD
-
column :sign_in_count
-
column :created_at
-
actions
-
end
-
=======
-
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
-
>>>>>>> 752f0c0 (Featire specs)
=======
-
>>>>>>> 4e81ea2 (Featire specs)
=======
-
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> 3dc272d (Featire specs)
=======
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> 1577aeb (Rebased)
=======
=======
>>>>>>> a5d032d (Fix)
>>>>>>> eaef86a (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
-
1
=======
=======
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 65459e8 (Add login registration pages)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
>>>>>>> cb955a0 (Add login registration pages)
=======
>>>>>>> eaef86a (Fix)
=======
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
>>>>>>> b5affcb (Add login registration pages)
=======
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4f7c979 (Add login registration pages)
=======
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
>>>>>>> 60943cc (Add login registration pages)
=======
>>>>>>> 1a9aba9 (Fix)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 22ee41c (Add login registration pages)
-
24
<<<<<<< HEAD
=======
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
>>>>>>> cacbab9 (Add login registration pages)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a624084 (Add login registration pages)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6a9fede (Add login registration pages)
-
25
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1214e1f (Add login registration pages)
=======
-
24
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> 3dc272d (Featire specs)
=======
=======
=======
-
24
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
-
25
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 22ee41c (Add login registration pages)
>>>>>>> 27ceb6f (Add login registration pages)
<<<<<<< HEAD
filter :email
-
1
filter :current_sign_in_at
-
1
filter :sign_in_count
-
1
filter :created_at
-
-
1
form do |f|
-
f.inputs do
-
f.input :email
-
f.input :password
-
f.input :password_confirmation
-
end
-
f.actions
-
end
-
end
-
1
ActiveAdmin.register Book do
-
1
permit_params :title, :description, :price_cents, :dimensions, :year_of_publication, :materials, :quantity,
-
author_ids: [], category_ids: [], images: []
-
-
1
decorate_with BookDecorator
-
-
1
filter :authors, collection: AuthorDecorator.decorate_collection(Author.all)
-
1
filter :categories
-
1
filter :title
-
1
filter :year_of_publication
-
-
1
index do
-
6
selectable_column
-
-
6
column :categories, &:categories_names
-
6
column :title
-
6
column :authors, &:authors_names
-
6
column :description
-
6
column :price, &:price
-
6
column :quantity
-
-
6
actions
-
end
-
-
1
show do
-
5
attributes_table do
-
5
row :authors, &:authors_names
-
5
row :categories, &:categories_names
-
5
row :year_of_publication
-
5
row :description
-
5
row :materials
-
5
row :dimensions
-
5
row :price, &:price
-
5
row :created_at
-
5
row :updated_at
-
end
-
-
5
panel :images do
-
5
table do
-
5
book.images.each do |image|
-
2
span image_tag image.variant(resize_to_limit: [100, 100])
-
end
-
=======
=======
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
>>>>>>> eaef86a (Fix)
=======
>>>>>>> b35d1f8 (Featire specs)
=======
>>>>>>> a1fe6da (Featire specs)
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1a9aba9 (Fix)
<<<<<<< HEAD
-
=======
-
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
-
>>>>>>> 94841b5 (Featire specs)
=======
-
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
-
>>>>>>> 3b03895 (Featire specs)
=======
-
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
-
>>>>>>> e54deeb (Featire specs)
=======
-
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
-
>>>>>>> 9c0d812 (Featire specs)
=======
-
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
-
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
-
=======
-
>>>>>>> 752f0c0 (Featire specs)
=======
-
>>>>>>> 4e81ea2 (Featire specs)
=======
-
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> 3dc272d (Featire specs)
=======
=======
=======
-
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
=======
=======
-
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> 1577aeb (Rebased)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
-
=======
-
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 8c32a77 (Featire specs)
=======
=======
=======
-
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 56ef3ac (Featire specs)
=======
=======
=======
-
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 113da87 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 8b420cf (Featire specs)
=======
=======
=======
-
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
=======
-
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 20256f8 (Featire specs)
=======
=======
=======
-
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
=======
-
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> eaef86a (Fix)
=======
=======
-
=======
-
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> b35d1f8 (Featire specs)
=======
=======
=======
-
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> a1fe6da (Featire specs)
=======
=======
=======
-
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 28fed3c (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ed6aebd (Featire specs)
=======
=======
=======
-
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
=======
=======
-
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> 64d4167 (Featire specs)
=======
=======
=======
-
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
=======
=======
-
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 13fd74f (Featire specs)
=======
=======
=======
-
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
=======
-
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1a9aba9 (Fix)
end
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
-
end
-
end
-
-
1
form do |f|
-
6
f.inputs do
-
6
f.input :title
-
6
f.input :description
-
6
f.input :year_of_publication
-
6
f.input :price_cents
-
6
f.input :materials
-
6
f.input :dimensions
-
6
f.input :quantity
-
-
6
f.input :categories, as: :select, collection: Category.all
-
6
f.input :authors, as: :select, collection: AuthorDecorator.decorate_collection(Author.all)
-
6
f.input :images, as: :file, input_html: { multiple: true }
-
end
-
-
6
panel :images do
-
6
f.object.images.each do |image|
-
1
span image_tag image.variant(resize_to_limit: [100, 100])
-
1
span link_to('Delete', delete_image_admin_book_path(image.id), method: :delete,
-
data: { confirm: "Delete #{image.filename}?" })
-
end
-
end
-
-
6
f.actions
-
end
-
-
1
member_action :delete_image, method: :delete do
-
1
ActiveStorage::Attachment.find(params[:id]).purge_later
-
1
redirect_back(fallback_location: edit_admin_book_path)
-
end
-
end
-
1
ActiveAdmin.register Coupon do
-
1
permit_params :code, :is_active, :active_till_date, :discount, :order_id
-
-
1
index do
-
selectable_column
-
-
column :code
-
column :is_active
-
column :active_till_date
-
column :discount
-
-
actions
-
end
-
-
1
show do
-
attributes_table do
-
row :code
-
row :is_active
-
row :active_till_date
-
row :discount
-
row :order
-
end
-
end
-
-
1
form do |f|
-
f.inputs do
-
f.input :code
-
f.input :is_active
-
f.input :active_till_date
-
f.input :discount
-
f.input :order
-
end
-
-
f.actions
-
end
-
end
-
# frozen_string_literal: true
-
-
1
ActiveAdmin.register_page 'Dashboard' do
-
39
menu priority: 1, label: proc { I18n.t('active_admin.dashboard') }
-
-
1
action_item only: :show do
-
link_to 'SideKiq View', sidekiq_web_path
-
end
-
-
1
content title: proc { I18n.t('active_admin.dashboard') } do
-
div class: 'blank_slate_container', id: 'dashboard_default_message' do
-
span class: 'blank_slate' do
-
span I18n.t('active_admin.dashboard_welcome.welcome')
-
small I18n.t('active_admin.dashboard_welcome.call_to_action')
-
end
-
end
-
end
-
end
-
1
ActiveAdmin.register Order do
-
1
permit_params :user_id, :coupon_id, :total_price, :status, :last_action
-
-
1
index do
-
selectable_column
-
-
column :user
-
column :coupon
-
column :total_price
-
column :status
-
column :last_action
-
-
actions
-
end
-
-
1
show do
-
attributes_table do
-
row :user
-
row :coupon
-
row :total_price
-
row :status
-
row :last_action
-
end
-
end
=======
=======
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
>>>>>>> eaef86a (Fix)
=======
>>>>>>> b35d1f8 (Featire specs)
=======
>>>>>>> a1fe6da (Featire specs)
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
@book = Book.find(params[:id]).decorate
=======
book = Book.find_by(id: params[:id])
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
book = Book.find_by(id: params[:id])
>>>>>>> 9c0d812 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
@book = Book.find(params[:id]).decorate
=======
@book = Book.find_by(id: params[:id])
>>>>>>> 752f0c0 (Featire specs)
=======
@book = Book.find_by(id: params[:id])
>>>>>>> 4e81ea2 (Featire specs)
=======
@book = Book.find_by(id: params[:id])
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> 3dc272d (Featire specs)
=======
=======
=======
@book = Book.find(params[:id]).decorate
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
=======
=======
book = Book.find_by(id: params[:id])
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> 1577aeb (Rebased)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
book = Book.find_by(id: params[:id])
=======
@book = Book.find_by(id: params[:id])
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 8c32a77 (Featire specs)
=======
=======
=======
@book = Book.find_by(id: params[:id])
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 56ef3ac (Featire specs)
=======
=======
=======
@book = Book.find_by(id: params[:id])
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 113da87 (Featire specs)
=======
=======
=======
@book = Book.find_by(id: params[:id])
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 8b420cf (Featire specs)
=======
=======
=======
@book = Book.find(params[:id]).decorate
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
=======
@book = Book.find_by(id: params[:id])
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 20256f8 (Featire specs)
=======
=======
=======
@book = Book.find(params[:id]).decorate
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
=======
book = Book.find(params[:id])
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> eaef86a (Fix)
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
book = Book.find(params[:id])
=======
@book = Book.find_by(id: params[:id])
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> b35d1f8 (Featire specs)
=======
=======
=======
@book = Book.find_by(id: params[:id])
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> a1fe6da (Featire specs)
=======
=======
=======
@book = Book.find_by(id: params[:id])
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 28fed3c (Featire specs)
=======
=======
=======
@book = Book.find_by(id: params[:id])
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ed6aebd (Featire specs)
=======
=======
=======
@book = Book.find(params[:id]).decorate
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
=======
=======
@book = Book.find_by(id: params[:id])
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> 64d4167 (Featire specs)
=======
=======
=======
@book = Book.find(params[:id]).decorate
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
=======
=======
@book = Book.find_by(id: params[:id])
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 13fd74f (Featire specs)
=======
=======
=======
@book = Book.find(params[:id]).decorate
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1a9aba9 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
-
=======
-
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
-
>>>>>>> 94841b5 (Featire specs)
=======
-
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
-
>>>>>>> 3b03895 (Featire specs)
=======
-
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
-
>>>>>>> e54deeb (Featire specs)
=======
-
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
-
>>>>>>> 9c0d812 (Featire specs)
=======
-
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
-
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
-
=======
-
>>>>>>> 752f0c0 (Featire specs)
=======
-
>>>>>>> 4e81ea2 (Featire specs)
=======
-
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
=======
-
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
-
>>>>>>> c033601 (Rebased)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
-
=======
-
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
=======
=======
-
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
=======
=======
-
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
=======
=======
-
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
-
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
=======
=======
-
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
-
>>>>>>> a5d032d (Fix)
=======
-
=======
-
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
=======
=======
-
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
=======
=======
-
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
=======
-
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
=======
-
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
=======
=======
-
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
=======
-
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
=======
=======
-
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
-
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
-
1
=======
=======
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
>>>>>>> eaef86a (Fix)
=======
>>>>>>> b35d1f8 (Featire specs)
=======
>>>>>>> a1fe6da (Featire specs)
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1a9aba9 (Fix)
<<<<<<< HEAD
-
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
-
=======
-
>>>>>>> 752f0c0 (Featire specs)
=======
-
>>>>>>> 4e81ea2 (Featire specs)
=======
-
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
=======
-
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
7
<<<<<<< HEAD
>>>>>>> 3dc272d (Featire specs)
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
-
11
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> 1577aeb (Rebased)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
-
11
=======
-
11
>>>>>>> 9620751 (Featire specs)
=======
-
7
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 8c32a77 (Featire specs)
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
-
7
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 56ef3ac (Featire specs)
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
=======
-
7
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 113da87 (Featire specs)
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
-
7
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 8b420cf (Featire specs)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
-
7
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 3b03895 (Featire specs)
=======
-
7
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 20256f8 (Featire specs)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
-
7
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
=======
-
11
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> eaef86a (Fix)
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> b35d1f8 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> a1fe6da (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 28fed3c (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ed6aebd (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> 64d4167 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
=======
=======
-
7
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 13fd74f (Featire specs)
=======
=======
=======
-
7
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
=======
-
15
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1a9aba9 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
form do |f|
=======
if book.nil?
>>>>>>> 1577aeb (Rebased)
=======
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
>>>>>>> eaef86a (Fix)
=======
=======
>>>>>>> 9620751 (Featire specs)
>>>>>>> b35d1f8 (Featire specs)
=======
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1a9aba9 (Fix)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> a1fe6da (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 28fed3c (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ed6aebd (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> 64d4167 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 13fd74f (Featire specs)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
if book.nil?
=======
redirect_to books_path if @book.nil?
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8c32a77 (Featire specs)
=======
=======
>>>>>>> b35d1f8 (Featire specs)
=======
>>>>>>> a1fe6da (Featire specs)
=======
redirect_to books_path if @book.nil?
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 56ef3ac (Featire specs)
=======
=======
redirect_to books_path if @book.nil?
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 113da87 (Featire specs)
=======
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> ed6aebd (Featire specs)
=======
redirect_to books_path if @book.nil?
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8b420cf (Featire specs)
=======
=======
redirect_to books_path if @book.nil?
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 64d4167 (Featire specs)
=======
redirect_to books_path if @book.nil?
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 20256f8 (Featire specs)
=======
=======
redirect_to books_path if @book.nil?
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
>>>>>>> 13fd74f (Featire specs)
=======
if book.nil?
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> eaef86a (Fix)
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> b35d1f8 (Featire specs)
=======
=======
=======
redirect_to books_path if @book.nil?
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> a1fe6da (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 28fed3c (Featire specs)
=======
=======
=======
redirect_to books_path if @book.nil?
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ed6aebd (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
=======
=======
redirect_to books_path if @book.nil?
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> 64d4167 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
=======
=======
redirect_to books_path if @book.nil?
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 13fd74f (Featire specs)
=======
=======
=======
redirect_to books_path if @book.nil?
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
=======
if book.nil?
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1a9aba9 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
-
f.inputs do
-
f.input :user_id
-
f.input :coupon_id
-
f.input :total_price
-
f.input :status
-
f.input :last_action
-
f.input :books
-
end
-
-
f.actions
-
=======
=======
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
>>>>>>> eaef86a (Fix)
=======
>>>>>>> b35d1f8 (Featire specs)
=======
>>>>>>> a1fe6da (Featire specs)
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1a9aba9 (Fix)
<<<<<<< HEAD
-
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
-
=======
-
>>>>>>> 752f0c0 (Featire specs)
=======
-
>>>>>>> 4e81ea2 (Featire specs)
=======
-
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> 3dc272d (Featire specs)
=======
=======
=======
-
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a5d032d (Fix)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7c4ea7f (Fix)
-
redirect_to books_path
-
else
-
15
<<<<<<< HEAD
=======
@reviews = ReviewDecorator.decorate_collection(Review.where(book_id: book.id).order(created_at: :desc))
-
15
>>>>>>> a5d032d (Fix)
@book = book.decorate
<<<<<<< HEAD
-
=======
-
>>>>>>> a5d032d (Fix)
end
<<<<<<< HEAD
<<<<<<< HEAD
-
<<<<<<< HEAD
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> 1577aeb (Rebased)
=======
=======
=======
-
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 8c32a77 (Featire specs)
=======
=======
=======
-
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 56ef3ac (Featire specs)
=======
=======
=======
-
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 113da87 (Featire specs)
=======
=======
=======
-
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 8b420cf (Featire specs)
=======
=======
=======
-
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
=======
-
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 20256f8 (Featire specs)
=======
=======
=======
-
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
=======
-
<<<<<<< HEAD
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> eaef86a (Fix)
=======
=======
=======
-
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> b35d1f8 (Featire specs)
=======
=======
=======
-
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> a1fe6da (Featire specs)
=======
=======
=======
-
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 28fed3c (Featire specs)
=======
=======
=======
-
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ed6aebd (Featire specs)
=======
=======
=======
-
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
=======
=======
-
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> 64d4167 (Featire specs)
=======
=======
=======
-
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
=======
=======
-
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 13fd74f (Featire specs)
=======
=======
=======
-
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
=======
-
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1a9aba9 (Fix)
end
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
-
end
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c033601 (Rebased)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
=======
=======
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6fa625b (Manifest_cache true)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
>>>>>>> bf554f4 (Rebased)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
=======
=======
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54deeb (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7c4ea7f (Fix)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9dc109d (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 864f339 (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> a2de409 (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54ceb0 (Featire specs)
=======
>>>>>>> 8f1bc14 (Fix)
>>>>>>> 715fac2 (Featire specs)
-
1
<<<<<<< HEAD
ActiveAdmin.register AdminUser do
=======
class ApplicationController < ActionController::Base
-
1
before_action :user_or_guest_have_order
-
-
1
private
-
-
1
def user_or_guest_have_order
-
187
if current_user
-
42
session[:order_id] = Order.find_or_create_by(user_id: current_user.id).id
-
42
CartCleaner.set(wait: 1.week).perform_later(session[:order_id])
-
145
elsif session[:order_id].nil? || Order.where(id: session[:order_id]).empty?
-
55
session[:order_id] = Order.create.id
-
55
CartCleaner.set(wait: 1.week).perform_later(session[:order_id])
-
end
-
end
-
end
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a5d032d (Fix)
-
1
class BooksController < ApplicationController
>>>>>>> 715fac2 (Featire specs)
-
1
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
permit_params :email, :password, :password_confirmation
=======
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d15fe1d (Fix)
=======
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
=======
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0b5b269 (Fix)
<<<<<<< HEAD
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 94841b5 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
PAGINATION_PER_PAGE = 12
>>>>>>> 715fac2 (Featire specs)
-
-
1
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
index do
=======
=======
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
>>>>>>> c033601 (Rebased)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a5d032d (Fix)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7c4ea7f (Fix)
def index
>>>>>>> 715fac2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
-
=======
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 45f9f35 (Add login registration pages)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 697ad44 (Add login registration pages)
=======
>>>>>>> d15fe1d (Fix)
=======
>>>>>>> b4763a2 (Featire specs)
=======
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
>>>>>>> af9487a (Add login registration pages)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 140c987 (Add login registration pages)
=======
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0c3a150 (Add login registration pages)
=======
>>>>>>> 0b5b269 (Fix)
=======
>>>>>>> d6f7da8 (Featire specs)
=======
>>>>>>> f5da5ac (Featire specs)
=======
>>>>>>> 5f79779 (Featire specs)
=======
>>>>>>> 56a05fb (Featire specs)
=======
>>>>>>> 6d21330 (Featire specs)
=======
>>>>>>> 27e3351 (Featire specs)
=======
>>>>>>> 1ac6be1 (Fix)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 22ee41c (Add login registration pages)
-
24
<<<<<<< HEAD
=======
=======
-
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a624084 (Add login registration pages)
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6a9fede (Add login registration pages)
=======
>>>>>>> 7c4ea7f (Fix)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
>>>>>>> 5a0bcc7 (Featire specs)
=======
>>>>>>> 8f1bc14 (Fix)
-
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
25
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1214e1f (Add login registration pages)
=======
-
24
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> 715fac2 (Featire specs)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
-
24
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
-
25
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 22ee41c (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 03c0867 (Add login registration pages)
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 864f339 (Featire specs)
=======
>>>>>>> a2de409 (Featire specs)
=======
>>>>>>> e54ceb0 (Featire specs)
-
25
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> 836a973 (Rebased)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
>>>>>>> cacbab9 (Add login registration pages)
-
25
=======
-
25
>>>>>>> 9620751 (Featire specs)
=======
-
25
>>>>>>> 9dc109d (Featire specs)
=======
-
24
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 2a25e4c (Featire specs)
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 864f339 (Featire specs)
=======
-
24
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 3e9f99d (Featire specs)
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> a2de409 (Featire specs)
=======
-
24
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5be567f (Featire specs)
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> e54ceb0 (Featire specs)
=======
-
24
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 2ee03d3 (Featire specs)
=======
=======
=======
-
24
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
=======
=======
-
25
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 57a2e05 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 45f9f35 (Add login registration pages)
=======
=======
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
-
24
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5506bd0 (Featire specs)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
-
24
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> a624084 (Add login registration pages)
=======
-
25
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> cacbab9 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 697ad44 (Add login registration pages)
=======
=======
-
25
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> d15fe1d (Fix)
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> b4763a2 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> bcd09ab (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> c006a44 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 848bfa2 (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
<<<<<<< HEAD
>>>>>>> af9487a (Add login registration pages)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9ca3b84 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> a624084 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 140c987 (Add login registration pages)
=======
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
=======
-
24
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> fefbd35 (Featire specs)
=======
=======
=======
-
24
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
=======
=======
-
25
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 6a9fede (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 0c3a150 (Add login registration pages)
=======
=======
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
>>>>>>> 0b5b269 (Fix)
=======
=======
>>>>>>> 9dc109d (Featire specs)
<<<<<<< HEAD
>>>>>>> d6f7da8 (Featire specs)
=======
=======
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
>>>>>>> f5da5ac (Featire specs)
=======
=======
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5f79779 (Featire specs)
=======
=======
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 56a05fb (Featire specs)
=======
=======
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6d21330 (Featire specs)
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 27e3351 (Featire specs)
=======
=======
>>>>>>> 8f1bc14 (Fix)
>>>>>>> 1ac6be1 (Fix)
selectable_column
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
-
=======
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 45f9f35 (Add login registration pages)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 697ad44 (Add login registration pages)
=======
>>>>>>> d15fe1d (Fix)
=======
>>>>>>> b4763a2 (Featire specs)
=======
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
>>>>>>> af9487a (Add login registration pages)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 140c987 (Add login registration pages)
=======
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0c3a150 (Add login registration pages)
=======
>>>>>>> 0b5b269 (Fix)
=======
>>>>>>> d6f7da8 (Featire specs)
=======
>>>>>>> f5da5ac (Featire specs)
=======
>>>>>>> 5f79779 (Featire specs)
=======
>>>>>>> 56a05fb (Featire specs)
=======
>>>>>>> 6d21330 (Featire specs)
=======
>>>>>>> 27e3351 (Featire specs)
=======
>>>>>>> 1ac6be1 (Fix)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 22ee41c (Add login registration pages)
-
24
<<<<<<< HEAD
=======
=======
-
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a624084 (Add login registration pages)
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6a9fede (Add login registration pages)
=======
>>>>>>> 7c4ea7f (Fix)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
>>>>>>> 5a0bcc7 (Featire specs)
=======
>>>>>>> 8f1bc14 (Fix)
-
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
25
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1214e1f (Add login registration pages)
=======
-
24
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> 715fac2 (Featire specs)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
-
24
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
-
25
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 22ee41c (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 03c0867 (Add login registration pages)
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 864f339 (Featire specs)
=======
>>>>>>> a2de409 (Featire specs)
=======
>>>>>>> e54ceb0 (Featire specs)
-
25
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> 836a973 (Rebased)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
>>>>>>> cacbab9 (Add login registration pages)
-
25
=======
-
25
>>>>>>> 9620751 (Featire specs)
=======
-
25
>>>>>>> 9dc109d (Featire specs)
=======
-
24
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 2a25e4c (Featire specs)
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 864f339 (Featire specs)
=======
-
24
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 3e9f99d (Featire specs)
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> a2de409 (Featire specs)
=======
-
24
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5be567f (Featire specs)
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> e54ceb0 (Featire specs)
=======
-
24
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 2ee03d3 (Featire specs)
=======
=======
=======
-
24
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
=======
=======
-
25
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 57a2e05 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 45f9f35 (Add login registration pages)
=======
=======
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
-
24
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5506bd0 (Featire specs)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
-
24
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> a624084 (Add login registration pages)
=======
-
25
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> cacbab9 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 697ad44 (Add login registration pages)
=======
=======
-
25
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> d15fe1d (Fix)
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> b4763a2 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> bcd09ab (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> c006a44 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 848bfa2 (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
<<<<<<< HEAD
>>>>>>> af9487a (Add login registration pages)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9ca3b84 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> a624084 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 140c987 (Add login registration pages)
=======
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
=======
-
24
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> fefbd35 (Featire specs)
=======
=======
=======
-
24
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
=======
=======
-
25
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 6a9fede (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 0c3a150 (Add login registration pages)
=======
=======
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
>>>>>>> 0b5b269 (Fix)
=======
=======
>>>>>>> 9dc109d (Featire specs)
<<<<<<< HEAD
>>>>>>> d6f7da8 (Featire specs)
=======
=======
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
>>>>>>> f5da5ac (Featire specs)
=======
=======
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5f79779 (Featire specs)
=======
=======
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 56a05fb (Featire specs)
=======
=======
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6d21330 (Featire specs)
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 27e3351 (Featire specs)
=======
=======
>>>>>>> 8f1bc14 (Fix)
>>>>>>> 1ac6be1 (Fix)
id_column
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
-
=======
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 45f9f35 (Add login registration pages)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 697ad44 (Add login registration pages)
=======
>>>>>>> d15fe1d (Fix)
=======
>>>>>>> b4763a2 (Featire specs)
=======
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
>>>>>>> af9487a (Add login registration pages)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 140c987 (Add login registration pages)
=======
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0c3a150 (Add login registration pages)
=======
>>>>>>> 0b5b269 (Fix)
=======
>>>>>>> d6f7da8 (Featire specs)
=======
>>>>>>> f5da5ac (Featire specs)
=======
>>>>>>> 5f79779 (Featire specs)
=======
>>>>>>> 56a05fb (Featire specs)
=======
>>>>>>> 6d21330 (Featire specs)
=======
>>>>>>> 27e3351 (Featire specs)
=======
>>>>>>> 1ac6be1 (Fix)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
-
24
<<<<<<< HEAD
>>>>>>> 715fac2 (Featire specs)
=======
=======
=======
>>>>>>> 22ee41c (Add login registration pages)
-
24
=======
-
25
>>>>>>> 1214e1f (Add login registration pages)
=======
-
24
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
=======
=======
-
25
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 22ee41c (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 03c0867 (Add login registration pages)
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a624084 (Add login registration pages)
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6a9fede (Add login registration pages)
=======
>>>>>>> 864f339 (Featire specs)
=======
>>>>>>> a2de409 (Featire specs)
=======
>>>>>>> e54ceb0 (Featire specs)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
>>>>>>> 5a0bcc7 (Featire specs)
-
25
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> 836a973 (Rebased)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
>>>>>>> cacbab9 (Add login registration pages)
-
25
=======
-
25
>>>>>>> 9620751 (Featire specs)
=======
-
25
>>>>>>> 9dc109d (Featire specs)
=======
-
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 2a25e4c (Featire specs)
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 864f339 (Featire specs)
=======
-
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 3e9f99d (Featire specs)
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> a2de409 (Featire specs)
=======
-
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5be567f (Featire specs)
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> e54ceb0 (Featire specs)
=======
-
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 2ee03d3 (Featire specs)
=======
=======
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
-
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5506bd0 (Featire specs)
=======
=======
-
25
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> d15fe1d (Fix)
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> b4763a2 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> bcd09ab (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> c006a44 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 848bfa2 (Featire specs)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9ca3b84 (Featire specs)
=======
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
=======
-
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> fefbd35 (Featire specs)
=======
=======
-
25
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
>>>>>>> 0b5b269 (Fix)
=======
=======
>>>>>>> 9dc109d (Featire specs)
<<<<<<< HEAD
>>>>>>> d6f7da8 (Featire specs)
=======
=======
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
>>>>>>> f5da5ac (Featire specs)
=======
=======
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5f79779 (Featire specs)
=======
=======
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 56a05fb (Featire specs)
=======
=======
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6d21330 (Featire specs)
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 27e3351 (Featire specs)
=======
=======
-
25
>>>>>>> 8f1bc14 (Fix)
>>>>>>> 1ac6be1 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
column :email
=======
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d15fe1d (Fix)
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> 9620751 (Featire specs)
>>>>>>> b4763a2 (Featire specs)
=======
=======
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> 0b5b269 (Fix)
=======
>>>>>>> d6f7da8 (Featire specs)
=======
>>>>>>> f5da5ac (Featire specs)
=======
>>>>>>> 5f79779 (Featire specs)
=======
>>>>>>> 56a05fb (Featire specs)
=======
>>>>>>> 6d21330 (Featire specs)
=======
>>>>>>> 27e3351 (Featire specs)
=======
>>>>>>> 1ac6be1 (Fix)
<<<<<<< HEAD
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> bcd09ab (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> c006a44 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 848bfa2 (Featire specs)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9ca3b84 (Featire specs)
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> fefbd35 (Featire specs)
=======
=======
>>>>>>> 9dc109d (Featire specs)
<<<<<<< HEAD
>>>>>>> d6f7da8 (Featire specs)
=======
=======
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
>>>>>>> f5da5ac (Featire specs)
=======
=======
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5f79779 (Featire specs)
=======
=======
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 56a05fb (Featire specs)
=======
=======
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6d21330 (Featire specs)
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
>>>>>>> 27e3351 (Featire specs)
sorted_books = BookQuery.query(params).paginate(page: params[:page],
=======
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 2a25e4c (Featire specs)
=======
=======
>>>>>>> b4763a2 (Featire specs)
=======
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> d6f7da8 (Featire specs)
=======
>>>>>>> f5da5ac (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 3e9f99d (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5be567f (Featire specs)
=======
=======
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> 5f79779 (Featire specs)
=======
>>>>>>> 56a05fb (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 2ee03d3 (Featire specs)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5506bd0 (Featire specs)
=======
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> 6d21330 (Featire specs)
=======
>>>>>>> 27e3351 (Featire specs)
=======
sorted_books = BookQuery.query(params).paginate(page: params[:page],
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> d15fe1d (Fix)
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> b4763a2 (Featire specs)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> bcd09ab (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> c006a44 (Featire specs)
=======
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 848bfa2 (Featire specs)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9ca3b84 (Featire specs)
=======
=======
=======
>>>>>>> 4552227 (Featire specs)
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> fefbd35 (Featire specs)
=======
=======
sorted_books = BookQuery.query(params).paginate(page: params[:page],
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
>>>>>>> 0b5b269 (Fix)
=======
=======
>>>>>>> 9dc109d (Featire specs)
<<<<<<< HEAD
>>>>>>> d6f7da8 (Featire specs)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
>>>>>>> f5da5ac (Featire specs)
=======
=======
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5f79779 (Featire specs)
=======
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 56a05fb (Featire specs)
=======
=======
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6d21330 (Featire specs)
=======
=======
=======
>>>>>>> 4552227 (Featire specs)
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 27e3351 (Featire specs)
=======
=======
sorted_books = BookQuery.query(params).paginate(page: params[:page],
>>>>>>> 8f1bc14 (Fix)
>>>>>>> 1ac6be1 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
-
=======
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d15fe1d (Fix)
=======
=======
>>>>>>> 9620751 (Featire specs)
>>>>>>> b4763a2 (Featire specs)
=======
=======
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> 0b5b269 (Fix)
=======
>>>>>>> d6f7da8 (Featire specs)
=======
>>>>>>> f5da5ac (Featire specs)
=======
>>>>>>> 5f79779 (Featire specs)
=======
>>>>>>> 56a05fb (Featire specs)
=======
>>>>>>> 6d21330 (Featire specs)
=======
>>>>>>> 27e3351 (Featire specs)
=======
>>>>>>> 1ac6be1 (Fix)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> bcd09ab (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> c006a44 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 848bfa2 (Featire specs)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9ca3b84 (Featire specs)
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> fefbd35 (Featire specs)
=======
=======
>>>>>>> 9dc109d (Featire specs)
<<<<<<< HEAD
>>>>>>> d6f7da8 (Featire specs)
=======
=======
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
>>>>>>> f5da5ac (Featire specs)
=======
=======
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5f79779 (Featire specs)
=======
=======
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 56a05fb (Featire specs)
=======
=======
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6d21330 (Featire specs)
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
>>>>>>> 27e3351 (Featire specs)
-
>>>>>>> 836a973 (Rebased)
=======
-
24
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 864f339 (Featire specs)
=======
-
24
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> a2de409 (Featire specs)
=======
-
24
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> e54ceb0 (Featire specs)
=======
-
24
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
-
24
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
-
>>>>>>> a5d032d (Fix)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 3b03895 (Featire specs)
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
=======
-
24
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
=======
-
>>>>>>> 7c4ea7f (Fix)
=======
>>>>>>> 9dc109d (Featire specs)
=======
>>>>>>> 864f339 (Featire specs)
=======
>>>>>>> a2de409 (Featire specs)
=======
>>>>>>> e54ceb0 (Featire specs)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
>>>>>>> 5a0bcc7 (Featire specs)
=======
-
>>>>>>> 8f1bc14 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
column :current_sign_in_at
=======
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d15fe1d (Fix)
=======
=======
>>>>>>> 9620751 (Featire specs)
>>>>>>> b4763a2 (Featire specs)
=======
=======
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> 0b5b269 (Fix)
=======
>>>>>>> d6f7da8 (Featire specs)
=======
>>>>>>> f5da5ac (Featire specs)
=======
>>>>>>> 5f79779 (Featire specs)
=======
>>>>>>> 56a05fb (Featire specs)
=======
>>>>>>> 6d21330 (Featire specs)
=======
>>>>>>> 27e3351 (Featire specs)
=======
>>>>>>> 1ac6be1 (Fix)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> bcd09ab (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> c006a44 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 848bfa2 (Featire specs)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9ca3b84 (Featire specs)
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> fefbd35 (Featire specs)
=======
=======
>>>>>>> 9dc109d (Featire specs)
<<<<<<< HEAD
>>>>>>> d6f7da8 (Featire specs)
=======
=======
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
>>>>>>> f5da5ac (Featire specs)
=======
=======
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5f79779 (Featire specs)
=======
=======
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 56a05fb (Featire specs)
=======
=======
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6d21330 (Featire specs)
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
>>>>>>> 27e3351 (Featire specs)
per_page: Constants::PAGINATION_PER_PAGE)
=======
@books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE)
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
@books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE)
>>>>>>> 752f0c0 (Featire specs)
=======
@books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE)
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
@books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE)
>>>>>>> 08edf50 (Featire specs)
=======
@books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE)
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
per_page: Constants::PAGINATION_PER_PAGE)
>>>>>>> a5d032d (Fix)
=======
>>>>>>> 9620751 (Featire specs)
=======
=======
@books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE)
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
=======
@books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE)
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 3b03895 (Featire specs)
=======
=======
@books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE)
>>>>>>> 4552227 (Featire specs)
>>>>>>> 94841b5 (Featire specs)
=======
per_page: Constants::PAGINATION_PER_PAGE)
>>>>>>> 7c4ea7f (Fix)
=======
>>>>>>> 9dc109d (Featire specs)
=======
=======
@books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE)
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 864f339 (Featire specs)
=======
>>>>>>> a2de409 (Featire specs)
=======
=======
@books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE)
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54ceb0 (Featire specs)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
=======
@books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE)
>>>>>>> 4552227 (Featire specs)
>>>>>>> 5a0bcc7 (Featire specs)
=======
per_page: Constants::PAGINATION_PER_PAGE)
>>>>>>> 8f1bc14 (Fix)
-
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a5d032d (Fix)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> 7c4ea7f (Fix)
=======
>>>>>>> 9dc109d (Featire specs)
=======
>>>>>>> 864f339 (Featire specs)
=======
>>>>>>> a2de409 (Featire specs)
=======
>>>>>>> e54ceb0 (Featire specs)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
>>>>>>> 5a0bcc7 (Featire specs)
=======
>>>>>>> 8f1bc14 (Fix)
-
25
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f182ac7 (Add login registration pages)
@books = BookDecorator.decorate_collection(sorted_books)
<<<<<<< HEAD
>>>>>>> 836a973 (Rebased)
=======
=======
def index
-
25
@books_count = Book.count
-
25
@categories = Category.all
-
25
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
-
24
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
-
25
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
-
24
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a624084 (Add login registration pages)
=======
-
25
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f182ac7 (Add login registration pages)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a624084 (Add login registration pages)
=======
=======
-
24
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
=======
-
25
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 6a9fede (Add login registration pages)
sorted_books = BookQuery.query(params).paginate(page: params[:page],
-
per_page: PAGINATION_PER_PAGE)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 039806b (Add login registration pages)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
@books = BookDecorator.decorate_collection(sorted_books)
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> d15fe1d (Fix)
=======
=======
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> f182ac7 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 0fc3bf0 (Add login registration pages)
=======
=======
>>>>>>> 1214e1f (Add login registration pages)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
=======
@books = BookDecorator.decorate_collection(sorted_books)
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 0b5b269 (Fix)
<<<<<<< HEAD
-
column :sign_in_count
-
column :created_at
-
actions
-
end
-
=======
-
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
-
>>>>>>> 752f0c0 (Featire specs)
=======
-
>>>>>>> 4e81ea2 (Featire specs)
=======
-
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> 715fac2 (Featire specs)
=======
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> 836a973 (Rebased)
=======
=======
>>>>>>> a5d032d (Fix)
>>>>>>> d15fe1d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
-
1
=======
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 45f9f35 (Add login registration pages)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 697ad44 (Add login registration pages)
=======
>>>>>>> d15fe1d (Fix)
=======
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
>>>>>>> af9487a (Add login registration pages)
=======
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 140c987 (Add login registration pages)
=======
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0c3a150 (Add login registration pages)
=======
>>>>>>> 0b5b269 (Fix)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 22ee41c (Add login registration pages)
-
24
<<<<<<< HEAD
=======
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
>>>>>>> cacbab9 (Add login registration pages)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a624084 (Add login registration pages)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6a9fede (Add login registration pages)
-
25
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1214e1f (Add login registration pages)
=======
-
24
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> 715fac2 (Featire specs)
=======
=======
=======
-
24
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
-
25
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 22ee41c (Add login registration pages)
>>>>>>> 03c0867 (Add login registration pages)
<<<<<<< HEAD
filter :email
-
1
filter :current_sign_in_at
-
1
filter :sign_in_count
-
1
filter :created_at
-
-
1
form do |f|
-
f.inputs do
-
f.input :email
-
f.input :password
-
f.input :password_confirmation
-
end
-
f.actions
-
end
-
end
-
1
ActiveAdmin.register Book do
-
1
permit_params :title, :description, :price_cents, :dimensions, :year_of_publication, :materials, :quantity,
-
author_ids: [], category_ids: [], images: []
-
-
1
decorate_with BookDecorator
-
-
1
filter :authors, collection: AuthorDecorator.decorate_collection(Author.all)
-
1
filter :categories
-
1
filter :title
-
1
filter :year_of_publication
-
-
1
index do
-
6
selectable_column
-
-
6
column :categories, &:categories_names
-
6
column :title
-
6
column :authors, &:authors_names
-
6
column :description
-
6
column :price, &:price
-
6
column :quantity
-
-
6
actions
-
end
-
-
1
show do
-
5
attributes_table do
-
5
row :authors, &:authors_names
-
5
row :categories, &:categories_names
-
5
row :year_of_publication
-
5
row :description
-
5
row :materials
-
5
row :dimensions
-
5
row :price, &:price
-
5
row :created_at
-
5
row :updated_at
-
end
-
-
5
panel :images do
-
5
table do
-
5
book.images.each do |image|
-
2
span image_tag image.variant(resize_to_limit: [100, 100])
-
end
-
=======
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d15fe1d (Fix)
=======
>>>>>>> b4763a2 (Featire specs)
=======
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0b5b269 (Fix)
<<<<<<< HEAD
-
=======
-
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
-
>>>>>>> 94841b5 (Featire specs)
=======
-
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
-
>>>>>>> 3b03895 (Featire specs)
=======
-
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
-
>>>>>>> e54deeb (Featire specs)
=======
-
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
-
>>>>>>> 9c0d812 (Featire specs)
=======
-
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
-
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
-
=======
-
>>>>>>> 752f0c0 (Featire specs)
=======
-
>>>>>>> 4e81ea2 (Featire specs)
=======
-
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> 715fac2 (Featire specs)
=======
=======
=======
-
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
=======
-
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> 836a973 (Rebased)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
-
=======
-
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 2a25e4c (Featire specs)
=======
=======
=======
-
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 3e9f99d (Featire specs)
=======
=======
=======
-
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5be567f (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 2ee03d3 (Featire specs)
=======
=======
=======
-
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
=======
=======
-
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5506bd0 (Featire specs)
=======
=======
=======
-
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
=======
-
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> d15fe1d (Fix)
=======
=======
-
=======
-
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> b4763a2 (Featire specs)
=======
=======
=======
-
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> bcd09ab (Featire specs)
=======
=======
=======
-
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> c006a44 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 848bfa2 (Featire specs)
=======
=======
=======
-
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
=======
=======
-
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9ca3b84 (Featire specs)
=======
=======
=======
-
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
=======
=======
-
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> fefbd35 (Featire specs)
=======
=======
=======
-
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
=======
-
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 0b5b269 (Fix)
end
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
-
end
-
end
-
-
1
form do |f|
-
6
f.inputs do
-
6
f.input :title
-
6
f.input :description
-
6
f.input :year_of_publication
-
6
f.input :price_cents
-
6
f.input :materials
-
6
f.input :dimensions
-
6
f.input :quantity
-
-
6
f.input :categories, as: :select, collection: Category.all
-
6
f.input :authors, as: :select, collection: AuthorDecorator.decorate_collection(Author.all)
-
6
f.input :images, as: :file, input_html: { multiple: true }
-
end
-
-
6
panel :images do
-
6
f.object.images.each do |image|
-
1
span image_tag image.variant(resize_to_limit: [100, 100])
-
1
span link_to('Delete', delete_image_admin_book_path(image.id), method: :delete,
-
data: { confirm: "Delete #{image.filename}?" })
-
end
-
end
-
-
6
f.actions
-
end
-
-
1
member_action :delete_image, method: :delete do
-
1
ActiveStorage::Attachment.find(params[:id]).purge_later
-
1
redirect_back(fallback_location: edit_admin_book_path)
-
end
-
end
-
1
require_relative '../services/checkout_service'
-
-
1
class CheckoutsController < ApplicationController
-
1
before_action :authenticate_user!, only: %i[show update]
-
1
def new; end
-
-
1
def create
-
2
user = User.new(email: permitted_params[:user][:email],
-
password: Devise.friendly_token.first(Devise.password_length.first))
-
2
user.skip_confirmation!
-
-
2
order = Order.find(session[:order_id])
-
-
2
if user.save
-
1
sign_in(:user, user)
-
1
user.send_reset_password_instructions
-
1
order.update(user_id: user.id)
-
-
1
redirect_to checkout_path(step: :address)
-
else
-
1
redirect_to new_checkout_path, alert: I18n.t('checkout.error_message')
-
end
-
end
-
-
1
def show
-
2
@order = Order.find(session[:order_id]).decorate
-
-
2
@user_billing = Billing.find_or_create_by(user_id: current_user.id)
-
2
@user_shipping = Shipping.find_or_create_by(user_id: current_user.id)
-
2
@credit_card = CreditCard.find_or_create_by(user_id: current_user.id)
-
-
2
step = permitted_params[:step]
-
-
2
case step
-
when 'initialize' then render 'checkouts/new'
-
when 'delivery' then render 'checkouts/delivery'
-
2
when 'address' then render 'checkouts/address'
-
when 'payment' then render 'checkouts/payment'
-
when 'confirm' then render 'checkouts/confirm'
-
when 'complete' then render 'checkouts/complete'
-
else
-
render 'checkouts/address'
-
end
-
end
-
-
1
def update
-
@order = Order.find(session[:order_id]).decorate
-
-
@user_billing = Billing.find_or_create_by(user_id: current_user.id)
-
@user_shipping = Shipping.find_or_create_by(user_id: current_user.id)
-
@credit_card = CreditCard.find_or_create_by(user_id: current_user.id)
-
-
case permitted_params[:step]
-
when 'address' then update_address(permitted_params)
-
when 'payment' then update_payment(permitted_params)
-
when 'confirm' then update_confirm
-
end
-
end
-
-
1
private
-
-
1
def permitted_params
-
4
params.permit(
-
:step, :code,
-
user: %i[password current_password password_confirmation email],
-
billing: %i[first_name last_name address city zip country phone],
-
shipping: %i[first_name last_name address city zip country phone],
-
credit_card: %i[name code cvv expiration_date]
-
)
-
end
-
-
1
def update_address(permitted_params)
-
if permitted_params[:shipping].nil?
-
update_billing(permitted_params[:billing])
-
else
-
update_shipping(permitted_params[:shipping])
-
end
-
end
-
-
1
def update_shipping(params)
-
if @user_shipping.update(params)
-
redirect_to checkout_path(step: :address), notice: 'Shipping was updated'
-
else
-
redirect_to checkout_path(step: :address), alert: CheckoutService.to_errors(@user_shipping.errors.messages)
-
end
-
end
-
-
1
def update_billing(params)
-
if @user_billing.update(params)
-
redirect_to checkout_path(step: :address), notice: 'Billing was updated'
-
else
-
redirect_to checkout_path(step: :address), alert: CheckoutService.to_errors(@user_billing.errors.messages)
-
end
-
end
-
-
1
def update_payment(permitted_params)
-
if @credit_card.update(permitted_params[:credit_card])
-
redirect_to checkout_path(step: :confirm)
-
else
-
redirect_to checkout_path(step: :payment), alert: CheckoutService.to_errors(@credit_card.errors.messages)
-
end
-
end
-
-
1
def update_confirm
-
@order.coupon&.update(is_active: false)
-
-
if @order.update(status: :created, total_price: count_total_price)
-
redirect_to root_path, notice: 'Order was created!'
-
else
-
redirect_to checkout_path(step: :confirm), alert: 'Something went wrong'
-
end
-
end
-
-
1
def count_total_price
-
product = OrderBook.where(order_id: @order.id)
-
-
total_price = product.map do |order|
-
order.book.price_cents * order.quantity
-
end.sum
-
-
total_price *= @order.coupon.discount unless @order.coupon.nil?
-
-
total_price + @order.delivery.price_cents
-
end
-
end
-
1
require_relative '../services/coupon_service'
-
-
1
class CouponsController < ApplicationController
-
1
def find
-
4
coupon = Coupon.find_by(code: params[:code])
-
4
order = Order.find(session[:order_id])
-
-
4
coupon&.update(order_id: order.id)
-
-
4
respond_to do |format|
-
4
format.json do
-
4
render json: CouponService.find_coupon(params, order, coupon)
-
end
-
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
-
2
f.actions
-
end
-
end
-
1
ActiveAdmin.register Coupon do
-
1
permit_params :code, :is_active, :active_till_date, :discount, :order_id
-
end
-
# frozen_string_literal: true
-
-
1
ActiveAdmin.register_page 'Dashboard' do
-
39
menu priority: 1, label: proc { I18n.t('active_admin.dashboard') }
-
-
1
action_item only: :show do
-
link_to 'SideKiq View', sidekiq_web_path
-
end
-
-
1
content title: proc { I18n.t('active_admin.dashboard') } do
-
div class: 'blank_slate_container', id: 'dashboard_default_message' do
-
span class: 'blank_slate' do
-
span I18n.t('active_admin.dashboard_welcome.welcome')
-
small I18n.t('active_admin.dashboard_welcome.call_to_action')
=======
=======
>>>>>>> 5f76842 (Featire specs)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> d7fadcd (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 2fd2048 (Featire specs)
=======
>>>>>>> bc0ff2c (Featire specs)
=======
>>>>>>> 9bf2aae (Featire specs)
=======
>>>>>>> 5ce1a6d (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4552227 (Featire specs)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> f861b82 (Featire specs)
=======
>>>>>>> 2fd2048 (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> bc0ff2c (Featire specs)
=======
>>>>>>> 9bf2aae (Featire specs)
=======
=======
>>>>>>> 4552227 (Featire specs)
>>>>>>> 5ce1a6d (Featire specs)
}
>>>>>>> 93db8b1 (Featire specs)
-
end
-
end
-
end
-
end
-
1
ActiveAdmin.register Order do
-
1
permit_params :user_id, :coupon_id, :total_price, :status, :last_action
-
end
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d15fe1d (Fix)
=======
>>>>>>> b4763a2 (Featire specs)
=======
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
@book = Book.find(params[:id]).decorate
>>>>>>> 715fac2 (Featire specs)
=======
book = Book.find_by(id: params[:id])
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
book = Book.find_by(id: params[:id])
>>>>>>> 9c0d812 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ee78f39 (Rebased)
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> d96cf3b (Featire specs)
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f764a87 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
>>>>>>> 6fa625b (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> c8cdb08 (Manifest_cache true)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
>>>>>>> bf554f4 (Rebased)
=======
=======
>>>>>>> ee78f39 (Rebased)
-
1
ActiveAdmin.register AdminUser do
-
1
permit_params :email, :password, :password_confirmation
-
-
1
index do
-
selectable_column
-
id_column
-
column :email
-
column :current_sign_in_at
-
column :sign_in_count
-
column :created_at
-
actions
-
end
-
-
1
filter :email
-
1
filter :current_sign_in_at
-
1
filter :sign_in_count
-
1
filter :created_at
-
-
1
<<<<<<< HEAD
form do |f|
=======
def show
-
7
@book = Book.find_by(id: params[:id])
-
-
<<<<<<< HEAD
<<<<<<< HEAD
=======
-
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
-
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4552227 (Featire specs)
=======
-
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
7
redirect_to books_path if @book.nil?
>>>>>>> 9bf2aae (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
-
=======
-
<<<<<<< HEAD
<<<<<<< HEAD
=======
-
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
-
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4552227 (Featire specs)
=======
-
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
7
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
f.inputs do
=======
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d7fadcd (Featire specs)
=======
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
@book = Book.find_by(id: params[:id])
=======
@book = Book.find(params[:id]).decorate
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
=======
=======
@book = Book.find_by(id: params[:id])
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a038b16 (Featire specs)
=======
=======
@book = Book.find(params[:id]).decorate
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
=======
=======
@book = Book.find_by(id: params[:id])
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> d7fadcd (Featire specs)
=======
=======
@book = Book.find(params[:id]).decorate
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
-
=======
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d7fadcd (Featire specs)
=======
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
-
=======
-
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
=======
=======
-
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a038b16 (Featire specs)
=======
=======
-
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
f.input :email
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
-
=======
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
-
=======
-
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
-
>>>>>>> 7a02bbe (Featire specs)
=======
-
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 45f6de0 (Fix book_spec decrease quantity and price)
7
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
f.input :password
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
-
=======
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
>>>>>>> 45f6de0 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 9bf2aae (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 7718476 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 5ce1a6d (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> cea736b (Fix book_spec decrease quantity and price)
-
=======
-
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
=======
=======
-
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a038b16 (Featire specs)
=======
=======
-
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
f.input :password_confirmation
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
-
=======
-
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
-
>>>>>>> 7a02bbe (Featire specs)
=======
-
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
end
-
f.actions
-
=======
>>>>>>> 45f6de0 (Fix book_spec decrease quantity and price)
=======
=======
-
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9bf2aae (Featire specs)
=======
=======
-
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 7718476 (Fix book_spec decrease quantity and price)
=======
=======
-
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5ce1a6d (Featire specs)
=======
=======
-
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> cea736b (Fix book_spec decrease quantity and price)
end
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
-
end
-
1
ActiveAdmin.register Author do
-
1
config.filters = true
-
1
permit_params :first_name, :last_name
-
-
1
filter :books, collection: Book.all
-
1
filter :first_name
-
1
filter :last_name
-
-
1
index do
-
3
selectable_column
-
-
3
column :first_name
-
3
column :last_name
-
-
3
actions
-
end
-
-
1
show do
-
3
attributes_table do
-
3
row :first_name
-
3
row :last_name
-
3
row :books
-
end
-
end
=======
=======
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
@book = Book.find(params[:id]).decorate
=======
@book = Book.find_by(id: params[:id])
>>>>>>> 752f0c0 (Featire specs)
=======
@book = Book.find_by(id: params[:id])
>>>>>>> 4e81ea2 (Featire specs)
=======
@book = Book.find_by(id: params[:id])
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> 715fac2 (Featire specs)
=======
=======
=======
@book = Book.find(params[:id]).decorate
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
=======
book = Book.find_by(id: params[:id])
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> 836a973 (Rebased)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
book = Book.find_by(id: params[:id])
=======
@book = Book.find_by(id: params[:id])
=======
<<<<<<< HEAD
>>>>>>> ea0650c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> a038b16 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 2a25e4c (Featire specs)
=======
=======
=======
@book = Book.find_by(id: params[:id])
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 3e9f99d (Featire specs)
=======
=======
=======
@book = Book.find_by(id: params[:id])
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5be567f (Featire specs)
=======
=======
=======
@book = Book.find_by(id: params[:id])
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 2ee03d3 (Featire specs)
=======
=======
=======
@book = Book.find(params[:id]).decorate
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
=======
=======
@book = Book.find_by(id: params[:id])
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5506bd0 (Featire specs)
=======
=======
=======
@book = Book.find(params[:id]).decorate
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
=======
book = Book.find(params[:id])
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> d15fe1d (Fix)
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
book = Book.find(params[:id])
=======
@book = Book.find_by(id: params[:id])
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> b4763a2 (Featire specs)
=======
=======
=======
@book = Book.find_by(id: params[:id])
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> bcd09ab (Featire specs)
=======
=======
=======
@book = Book.find_by(id: params[:id])
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> c006a44 (Featire specs)
=======
=======
=======
@book = Book.find_by(id: params[:id])
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 848bfa2 (Featire specs)
=======
=======
=======
@book = Book.find(params[:id]).decorate
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
=======
=======
@book = Book.find_by(id: params[:id])
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9ca3b84 (Featire specs)
=======
=======
=======
@book = Book.find(params[:id]).decorate
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
=======
=======
@book = Book.find_by(id: params[:id])
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> fefbd35 (Featire specs)
=======
=======
=======
@book = Book.find(params[:id]).decorate
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 0b5b269 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
-
=======
-
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
-
>>>>>>> 94841b5 (Featire specs)
=======
-
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
-
>>>>>>> 3b03895 (Featire specs)
=======
-
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
-
>>>>>>> e54deeb (Featire specs)
=======
-
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
-
>>>>>>> 9c0d812 (Featire specs)
=======
-
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
-
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
-
=======
-
>>>>>>> 752f0c0 (Featire specs)
=======
-
>>>>>>> 4e81ea2 (Featire specs)
=======
-
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
=======
-
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
-
>>>>>>> c033601 (Rebased)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
-
=======
-
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
=======
=======
-
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
=======
=======
-
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
=======
=======
-
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
-
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
=======
=======
-
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
-
>>>>>>> a5d032d (Fix)
=======
-
=======
-
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
=======
=======
-
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
=======
=======
-
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
=======
-
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
=======
-
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
=======
=======
-
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
=======
-
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
=======
=======
-
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
-
>>>>>>> 7c4ea7f (Fix)
=======
=======
-
>>>>>>> 4552227 (Featire specs)
>>>>>>> d7fadcd (Featire specs)
=======
=======
-
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
-
1
=======
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d15fe1d (Fix)
=======
>>>>>>> b4763a2 (Featire specs)
=======
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0b5b269 (Fix)
<<<<<<< HEAD
-
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
-
=======
=======
>>>>>>> d7fadcd (Featire specs)
=======
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
-
>>>>>>> 752f0c0 (Featire specs)
=======
-
>>>>>>> 4e81ea2 (Featire specs)
=======
-
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
=======
-
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
7
<<<<<<< HEAD
>>>>>>> 715fac2 (Featire specs)
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
-
11
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> 836a973 (Rebased)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
-
11
=======
-
11
>>>>>>> 9620751 (Featire specs)
=======
-
7
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 2a25e4c (Featire specs)
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
-
7
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 3e9f99d (Featire specs)
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
=======
-
7
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5be567f (Featire specs)
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
-
7
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 2ee03d3 (Featire specs)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
-
<<<<<<< HEAD
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
-
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> d7fadcd (Featire specs)
=======
=======
-
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
7
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 3b03895 (Featire specs)
=======
-
7
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5506bd0 (Featire specs)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
-
7
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
=======
-
11
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> d15fe1d (Fix)
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> b4763a2 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> bcd09ab (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> c006a44 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 848bfa2 (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9ca3b84 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
=======
=======
-
7
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> fefbd35 (Featire specs)
=======
=======
=======
-
7
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
=======
-
15
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 0b5b269 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
form do |f|
=======
if book.nil?
>>>>>>> 836a973 (Rebased)
=======
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d15fe1d (Fix)
=======
=======
>>>>>>> 9620751 (Featire specs)
>>>>>>> b4763a2 (Featire specs)
=======
=======
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0b5b269 (Fix)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> bcd09ab (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> c006a44 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 848bfa2 (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9ca3b84 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> fefbd35 (Featire specs)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
if book.nil?
=======
redirect_to books_path if @book.nil?
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 2a25e4c (Featire specs)
=======
=======
>>>>>>> b4763a2 (Featire specs)
=======
>>>>>>> bcd09ab (Featire specs)
=======
redirect_to books_path if @book.nil?
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 3e9f99d (Featire specs)
=======
=======
redirect_to books_path if @book.nil?
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5be567f (Featire specs)
=======
=======
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
redirect_to books_path if @book.nil?
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 2ee03d3 (Featire specs)
=======
=======
redirect_to books_path if @book.nil?
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
redirect_to books_path if @book.nil?
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 5506bd0 (Featire specs)
=======
=======
redirect_to books_path if @book.nil?
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
>>>>>>> fefbd35 (Featire specs)
=======
if book.nil?
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> d15fe1d (Fix)
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> b4763a2 (Featire specs)
=======
=======
=======
redirect_to books_path if @book.nil?
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> bcd09ab (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> c006a44 (Featire specs)
=======
=======
=======
redirect_to books_path if @book.nil?
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 848bfa2 (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
=======
=======
redirect_to books_path if @book.nil?
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9ca3b84 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
=======
=======
redirect_to books_path if @book.nil?
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> fefbd35 (Featire specs)
=======
=======
=======
redirect_to books_path if @book.nil?
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
=======
if book.nil?
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 0b5b269 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
-
2
f.inputs do
-
2
f.input :first_name
-
2
f.input :last_name
-
-
2
f.input :books, as: :select, collection: Book.all
-
end
-
-
2
f.actions
-
=======
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d15fe1d (Fix)
=======
>>>>>>> b4763a2 (Featire specs)
=======
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0b5b269 (Fix)
<<<<<<< HEAD
-
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
-
=======
=======
>>>>>>> d7fadcd (Featire specs)
=======
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
-
>>>>>>> 752f0c0 (Featire specs)
=======
-
>>>>>>> 4e81ea2 (Featire specs)
=======
-
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> 715fac2 (Featire specs)
=======
=======
=======
-
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a5d032d (Fix)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7c4ea7f (Fix)
-
redirect_to books_path
-
else
-
15
<<<<<<< HEAD
=======
@reviews = ReviewDecorator.decorate_collection(Review.where(book_id: book.id).order(created_at: :desc))
-
15
>>>>>>> a5d032d (Fix)
@book = book.decorate
<<<<<<< HEAD
-
=======
-
>>>>>>> a5d032d (Fix)
end
<<<<<<< HEAD
<<<<<<< HEAD
-
<<<<<<< HEAD
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> 836a973 (Rebased)
=======
=======
=======
-
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 2a25e4c (Featire specs)
=======
=======
=======
-
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 3e9f99d (Featire specs)
=======
=======
=======
-
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5be567f (Featire specs)
=======
=======
=======
-
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 2ee03d3 (Featire specs)
=======
=======
=======
-
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
=======
=======
-
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5506bd0 (Featire specs)
=======
=======
=======
-
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
=======
-
<<<<<<< HEAD
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> d15fe1d (Fix)
=======
=======
=======
-
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> b4763a2 (Featire specs)
=======
=======
=======
-
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> bcd09ab (Featire specs)
=======
=======
=======
-
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> c006a44 (Featire specs)
=======
=======
=======
-
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 848bfa2 (Featire specs)
=======
=======
=======
-
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
=======
=======
-
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9ca3b84 (Featire specs)
=======
=======
=======
-
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
=======
=======
-
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> fefbd35 (Featire specs)
=======
=======
=======
-
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
=======
-
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 0b5b269 (Fix)
=======
=======
-
>>>>>>> 4552227 (Featire specs)
>>>>>>> d7fadcd (Featire specs)
=======
=======
-
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
end
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
-
end
-
1
ActiveAdmin.register Book do
-
1
permit_params :title, :description, :price_cents, :dimensions, :year_of_publication, :materials, :quantity,
-
<<<<<<< HEAD
author_ids: [], category_ids: [], images: []
=======
category_ids: [], author_ids: []
>>>>>>> ee78f39 (Rebased)
-
-
1
decorate_with BookDecorator
-
-
1
filter :authors, collection: AuthorDecorator.decorate_collection(Author.all)
-
1
filter :categories
-
1
filter :title
-
1
filter :year_of_publication
-
-
1
index do
<<<<<<< HEAD
-
6
=======
-
4
>>>>>>> ee78f39 (Rebased)
selectable_column
-
<<<<<<< HEAD
-
6
column :categories, &:categories_names
-
6
=======
-
4
>>>>>>> ee78f39 (Rebased)
column :title
<<<<<<< HEAD
-
6
=======
-
4
>>>>>>> ee78f39 (Rebased)
<<<<<<< HEAD
column :authors, &:authors_names
=======
column :year_of_publication
>>>>>>> ee78f39 (Rebased)
<<<<<<< HEAD
-
6
=======
-
4
>>>>>>> ee78f39 (Rebased)
<<<<<<< HEAD
column :description
=======
column :materials
>>>>>>> ee78f39 (Rebased)
<<<<<<< HEAD
-
6
=======
-
4
>>>>>>> ee78f39 (Rebased)
<<<<<<< HEAD
column :price, &:price
=======
column :dimensions
>>>>>>> ee78f39 (Rebased)
<<<<<<< HEAD
-
6
=======
-
4
column :price_cents, &:price
-
4
>>>>>>> ee78f39 (Rebased)
column :quantity
<<<<<<< HEAD
-
=======
-
4
>>>>>>> ee78f39 (Rebased)
<<<<<<< HEAD
=======
column :authors, &:authors_names
>>>>>>> ee78f39 (Rebased)
<<<<<<< HEAD
-
6
=======
-
4
>>>>>>> ee78f39 (Rebased)
<<<<<<< HEAD
actions
=======
column :categories, &:categories_names
>>>>>>> ee78f39 (Rebased)
-
<<<<<<< HEAD
=======
-
4
actions
-
>>>>>>> ee78f39 (Rebased)
end
<<<<<<< HEAD
=======
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
-
=======
-
>>>>>>> ee78f39 (Rebased)
<<<<<<< HEAD
-
=======
-
>>>>>>> ee78f39 (Rebased)
1
show do
<<<<<<< HEAD
-
5
=======
-
3
>>>>>>> ee78f39 (Rebased)
attributes_table do
<<<<<<< HEAD
-
5
=======
-
3
>>>>>>> ee78f39 (Rebased)
row :authors, &:authors_names
<<<<<<< HEAD
-
5
=======
-
3
>>>>>>> ee78f39 (Rebased)
row :categories, &:categories_names
<<<<<<< HEAD
-
5
=======
-
3
>>>>>>> ee78f39 (Rebased)
row :year_of_publication
<<<<<<< HEAD
-
5
=======
-
3
>>>>>>> ee78f39 (Rebased)
row :description
<<<<<<< HEAD
-
5
=======
-
3
>>>>>>> ee78f39 (Rebased)
row :materials
<<<<<<< HEAD
-
5
=======
-
3
>>>>>>> ee78f39 (Rebased)
row :dimensions
<<<<<<< HEAD
-
5
=======
-
3
>>>>>>> ee78f39 (Rebased)
row :price, &:price
<<<<<<< HEAD
-
5
=======
-
3
>>>>>>> ee78f39 (Rebased)
row :created_at
<<<<<<< HEAD
-
5
=======
-
3
>>>>>>> ee78f39 (Rebased)
row :updated_at
<<<<<<< HEAD
-
=======
-
>>>>>>> ee78f39 (Rebased)
end
<<<<<<< HEAD
-
-
5
panel :images do
-
5
table do
-
5
book.images.each do |image|
-
2
span image_tag image.variant(resize_to_limit: [100, 100])
-
end
-
end
-
end
-
=======
-
>>>>>>> ee78f39 (Rebased)
end
<<<<<<< HEAD
-
=======
-
>>>>>>> ee78f39 (Rebased)
<<<<<<< HEAD
-
=======
-
>>>>>>> ee78f39 (Rebased)
1
form do |f|
<<<<<<< HEAD
-
6
=======
-
2
>>>>>>> ee78f39 (Rebased)
f.inputs do
<<<<<<< HEAD
-
6
=======
-
2
>>>>>>> ee78f39 (Rebased)
f.input :title
<<<<<<< HEAD
-
6
f.input :description
-
6
=======
-
2
>>>>>>> ee78f39 (Rebased)
f.input :year_of_publication
<<<<<<< HEAD
-
6
=======
-
2
>>>>>>> ee78f39 (Rebased)
f.input :price_cents
<<<<<<< HEAD
-
6
=======
-
2
>>>>>>> ee78f39 (Rebased)
f.input :materials
<<<<<<< HEAD
-
6
=======
-
2
>>>>>>> ee78f39 (Rebased)
f.input :dimensions
<<<<<<< HEAD
-
6
=======
-
2
>>>>>>> ee78f39 (Rebased)
f.input :quantity
<<<<<<< HEAD
=======
-
2
f.input :description, as: :text
-
-
2
f.input :categories, as: :select, collection: Category.all
-
2
f.input :authors, as: :select, collection: AuthorDecorator.decorate_collection(Author.all)
-
end
-
-
2
f.actions
>>>>>>> ee78f39 (Rebased)
-
<<<<<<< HEAD
-
6
f.input :categories, as: :select, collection: Category.all
-
6
f.input :authors, as: :select, collection: AuthorDecorator.decorate_collection(Author.all)
-
6
f.input :images, as: :file, input_html: { multiple: true }
-
end
-
-
6
panel :images do
-
6
f.object.images.each do |image|
-
1
span image_tag image.variant(resize_to_limit: [100, 100])
-
1
span link_to('Delete', delete_image_admin_book_path(image.id), method: :delete,
-
data: { confirm: "Delete #{image.filename}?" })
-
end
-
end
-
-
6
f.actions
-
=======
>>>>>>> ee78f39 (Rebased)
end
<<<<<<< HEAD
-
-
1
member_action :delete_image, method: :delete do
-
1
ActiveStorage::Attachment.find(params[:id]).destroy
-
1
redirect_back(fallback_location: edit_admin_book_path)
-
end
-
=======
-
>>>>>>> ee78f39 (Rebased)
end
-
1
ActiveAdmin.register Category do
-
1
permit_params :name, book_ids: []
-
-
1
filter :books, collection: Book.all
-
1
filter :name
-
-
1
index do
-
4
selectable_column
-
-
4
column :name
-
-
4
actions
-
end
-
-
1
show do
-
3
attributes_table do
-
3
row :name
-
3
row :created_at
-
3
row :updated_at
-
end
-
end
-
-
1
form do |f|
-
2
f.inputs do
-
2
f.input :name
-
2
f.input :books, as: :select, collection: Book.all
-
end
=======
<<<<<<< HEAD
>>>>>>> 715fac2 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 836a973 (Rebased)
=======
<<<<<<< HEAD
>>>>>>> 2a25e4c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 3e9f99d (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 5be567f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 2ee03d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 5506bd0 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> d15fe1d (Fix)
=======
<<<<<<< HEAD
>>>>>>> b4763a2 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> bcd09ab (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> c006a44 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 848bfa2 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 9ca3b84 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> fefbd35 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 0b5b269 (Fix)
-
=======
-
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
-
>>>>>>> 94841b5 (Featire specs)
=======
-
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
-
>>>>>>> 3b03895 (Featire specs)
=======
-
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
-
>>>>>>> e54deeb (Featire specs)
=======
-
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
-
>>>>>>> 9c0d812 (Featire specs)
=======
-
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
-
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
-
=======
-
>>>>>>> 752f0c0 (Featire specs)
=======
-
>>>>>>> 4e81ea2 (Featire specs)
=======
-
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
=======
-
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
-
>>>>>>> c033601 (Rebased)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
-
=======
-
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
=======
=======
-
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
=======
=======
-
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
=======
=======
-
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
-
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
=======
=======
-
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
-
>>>>>>> a5d032d (Fix)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
-
=======
-
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9620751 (Featire specs)
=======
=======
-
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 59d75f9 (Featire specs)
=======
=======
-
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
=======
-
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
=======
-
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
=======
=======
-
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
=======
-
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
=======
=======
-
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
-
end
-
1
class CheckoutsController < ApplicationController
-
1
def new; end
-
-
1
def create
-
2
user = User.new(email: params[:user][:email], password: Devise.friendly_token.first(Devise.password_length.first))
-
2
user.skip_confirmation!
-
-
2
if user.save
-
1
sign_in(:user, user)
-
1
user.send_reset_password_instructions
-
1
redirect_to order_path(session[:order_id])
-
else
-
1
redirect_to new_checkout_path, alert: I18n.t('checkout.error_message')
-
=======
>>>>>>> aa4fb26 (Add sort orders)
end
-
end
-
<<<<<<< HEAD
end
-
1
require_relative '../services/coupon_service'
-
-
1
class CouponsController < ApplicationController
-
1
def find
-
4
coupon = Coupon.find_by(code: params[:code])
-
4
order = Order.find(session[:order_id])
-
-
4
respond_to do |format|
-
4
format.json do
-
4
render json: CouponService.find_coupon(params, order, coupon)
-
end
-
end
-
end
-
>>>>>>> 7c4ea7f (Fix)
=======
=======
-
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 5f79779 (Featire specs)
=======
>>>>>>> 56a05fb (Featire specs)
=======
>>>>>>> 6d21330 (Featire specs)
=======
>>>>>>> 27e3351 (Featire specs)
<<<<<<< HEAD
=======
=======
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> 4552227 (Featire specs)
}
>>>>>>> f5da5ac (Featire specs)
-
2
f.actions
-
end
-
end
-
# frozen_string_literal: true
-
-
1
ActiveAdmin.register_page 'Dashboard' do
<<<<<<< HEAD
-
39
=======
-
31
>>>>>>> ee78f39 (Rebased)
menu priority: 1, label: proc { I18n.t('active_admin.dashboard') }
-
-
1
content title: proc { I18n.t('active_admin.dashboard') } do
-
div class: 'blank_slate_container', id: 'dashboard_default_message' do
-
span class: 'blank_slate' do
-
span I18n.t('active_admin.dashboard_welcome.welcome')
-
small I18n.t('active_admin.dashboard_welcome.call_to_action')
-
end
-
end
-
end
-
end
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> d780a52 (Rebased)
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 83979de (Featire specs)
=======
=======
=======
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 6fa625b (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> cfd1f7f (Manifest_cache true)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 12bcf81 (Featire specs)
=======
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3e35e (Featire specs)
=======
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c54769d (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 1677b1a (Featire specs)
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c346782 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> bf554f4 (Rebased)
>>>>>>> d52ad35 (Rebased)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> c033601 (Rebased)
>>>>>>> ee78f39 (Rebased)
=======
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> c033601 (Rebased)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
=======
=======
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6fa625b (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0bdcc5e (Manifest_cache true)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 563720e (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9bf83f (Featire specs)
=======
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
>>>>>>> 49e8a6c (Rebased)
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
=======
=======
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
-
1
class ApplicationController < ActionController::Base
-
1
before_action :user_or_guest_have_order
-
-
1
private
-
-
1
def user_or_guest_have_order
-
164
if current_user
-
36
session[:order_id] = Order.find_or_create_by(user_id: current_user.id).id
-
36
CartCleaner.set(wait: 1.week).perform_later(session[:order_id])
-
128
elsif session[:order_id].nil?
-
52
session[:order_id] = Order.create.id
-
52
CartCleaner.set(wait: 1.week).perform_later(session[:order_id])
-
end
-
end
-
end
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a5d032d (Fix)
=======
>>>>>>> 49e8a6c (Rebased)
=======
=======
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
-
1
class BooksController < ApplicationController
-
1
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
def index
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> ee78f39 (Rebased)
=======
=======
>>>>>>> d780a52 (Rebased)
=======
>>>>>>> c54769d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
=======
>>>>>>> c346782 (Fix book_spec decrease quantity and price)
=======
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 1677b1a (Featire specs)
=======
<<<<<<< HEAD
=======
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 94841b5 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
PAGINATION_PER_PAGE = 12
>>>>>>> d96cf3b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
-
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
-
>>>>>>> 752f0c0 (Featire specs)
=======
-
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
>>>>>>> c033601 (Rebased)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a5d032d (Fix)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7c4ea7f (Fix)
def index
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 22ee41c (Add login registration pages)
-
>>>>>>> 93bdda9 (Featire specs)
24
=======
-
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a624084 (Add login registration pages)
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6a9fede (Add login registration pages)
=======
>>>>>>> 7c4ea7f (Fix)
-
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
25
<<<<<<< HEAD
>>>>>>> 1214e1f (Add login registration pages)
=======
-
24
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
-
24
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
-
25
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 22ee41c (Add login registration pages)
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
-
25
<<<<<<< HEAD
>>>>>>> aca90e3 (Rebased)
=======
>>>>>>> c033601 (Rebased)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
>>>>>>> cacbab9 (Add login registration pages)
-
25
=======
-
25
>>>>>>> 9620751 (Featire specs)
=======
-
24
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
-
24
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 563720e (Featire specs)
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
=======
-
24
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9bf83f (Featire specs)
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
-
24
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
=======
=======
-
24
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
=======
-
25
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 57a2e05 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 8be9029 (Add login registration pages)
=======
=======
=======
>>>>>>> 3b03895 (Featire specs)
=======
-
24
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
-
24
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> a624084 (Add login registration pages)
=======
-
25
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> cacbab9 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 7d58507 (Add login registration pages)
=======
=======
-
25
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 551f3c1 (Add login registration pages)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> a624084 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> ccec311 (Add login registration pages)
=======
=======
=======
-
24
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
=======
-
24
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
=======
=======
-
25
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 6a9fede (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 8c3e531 (Add login registration pages)
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
@books_count = Book.count
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
-
=======
-
>>>>>>> 752f0c0 (Featire specs)
=======
-
>>>>>>> 4e81ea2 (Featire specs)
24
=======
-
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a624084 (Add login registration pages)
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6a9fede (Add login registration pages)
=======
>>>>>>> 7c4ea7f (Fix)
-
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
25
<<<<<<< HEAD
>>>>>>> 1214e1f (Add login registration pages)
=======
-
24
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
-
24
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
-
25
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 22ee41c (Add login registration pages)
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
-
25
<<<<<<< HEAD
>>>>>>> aca90e3 (Rebased)
=======
>>>>>>> c033601 (Rebased)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
>>>>>>> cacbab9 (Add login registration pages)
-
25
=======
-
25
>>>>>>> 9620751 (Featire specs)
=======
-
24
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
-
24
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 563720e (Featire specs)
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
=======
-
24
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9bf83f (Featire specs)
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
-
24
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
=======
=======
-
24
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
=======
-
25
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 57a2e05 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 8be9029 (Add login registration pages)
=======
=======
=======
>>>>>>> 3b03895 (Featire specs)
=======
-
24
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
-
24
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> a624084 (Add login registration pages)
=======
-
25
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> cacbab9 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 7d58507 (Add login registration pages)
=======
=======
-
25
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 551f3c1 (Add login registration pages)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> a624084 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> ccec311 (Add login registration pages)
=======
=======
=======
-
24
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
=======
-
24
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
=======
=======
-
25
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 6a9fede (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 8c3e531 (Add login registration pages)
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
@categories = Category.all
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
-
24
=======
-
25
>>>>>>> 1214e1f (Add login registration pages)
=======
-
24
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a624084 (Add login registration pages)
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6a9fede (Add login registration pages)
-
25
<<<<<<< HEAD
>>>>>>> aca90e3 (Rebased)
=======
>>>>>>> c033601 (Rebased)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
>>>>>>> cacbab9 (Add login registration pages)
-
25
=======
-
25
>>>>>>> 9620751 (Featire specs)
=======
-
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
-
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 563720e (Featire specs)
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
=======
-
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9bf83f (Featire specs)
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
-
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
=======
=======
>>>>>>> 3b03895 (Featire specs)
=======
-
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
=======
-
25
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
=======
-
>>>>>>> 4552227 (Featire specs)
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
-
25
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> 94841b5 (Featire specs)
sorted_books = BookQuery.query(params).paginate(page: params[:page],
=======
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
sorted_books = BookQuery.query(params).paginate(page: params[:page],
>>>>>>> a5d032d (Fix)
=======
>>>>>>> 9620751 (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 3b03895 (Featire specs)
=======
=======
>>>>>>> 4552227 (Featire specs)
>>>>>>> 94841b5 (Featire specs)
=======
sorted_books = BookQuery.query(params).paginate(page: params[:page],
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> 94841b5 (Featire specs)
-
=======
-
24
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 59d75f9 (Featire specs)
=======
-
24
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c4adab0 (Featire specs)
=======
-
24
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e54deeb (Featire specs)
=======
-
24
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 3b03895 (Featire specs)
=======
-
24
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
-
>>>>>>> a5d032d (Fix)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 3b03895 (Featire specs)
=======
=======
-
24
>>>>>>> 4552227 (Featire specs)
>>>>>>> 94841b5 (Featire specs)
=======
-
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> 94841b5 (Featire specs)
per_page: Constants::PAGINATION_PER_PAGE)
=======
@books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE)
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
@books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE)
>>>>>>> 752f0c0 (Featire specs)
=======
@books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE)
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
@books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE)
>>>>>>> 08edf50 (Featire specs)
=======
@books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE)
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
per_page: Constants::PAGINATION_PER_PAGE)
>>>>>>> a5d032d (Fix)
=======
>>>>>>> 9620751 (Featire specs)
=======
=======
@books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE)
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
=======
@books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE)
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 3b03895 (Featire specs)
=======
=======
@books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE)
>>>>>>> 4552227 (Featire specs)
>>>>>>> 94841b5 (Featire specs)
=======
per_page: Constants::PAGINATION_PER_PAGE)
>>>>>>> 7c4ea7f (Fix)
-
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a5d032d (Fix)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> 7c4ea7f (Fix)
-
25
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> f182ac7 (Add login registration pages)
>>>>>>> 852864e (Add login registration pages)
@books = BookDecorator.decorate_collection(sorted_books)
=======
=======
>>>>>>> f764a87 (Fix book_spec decrease quantity and price)
=======
>>>>>>> c54769d (Fix book_spec decrease quantity and price)
=======
>>>>>>> c346782 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> df37394 (Featire specs)
=======
=======
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
>>>>>>> c033601 (Rebased)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a5d032d (Fix)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c033601 (Rebased)
>>>>>>> ee78f39 (Rebased)
def index
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> df37394 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 22ee41c (Add login registration pages)
<<<<<<< HEAD
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> e50f73e (Add login registration pages)
-
24
<<<<<<< HEAD
=======
=======
-
25
>>>>>>> 1214e1f (Add login registration pages)
=======
-
24
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
>>>>>>> 5c33a07 (Featire specs)
=======
=======
-
24
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e50f73e (Add login registration pages)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
=======
-
25
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 22ee41c (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ee78f39 (Rebased)
=======
-
25
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
>>>>>>> cacbab9 (Add login registration pages)
-
25
=======
-
24
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
=======
=======
-
24
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
=======
=======
-
24
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
=======
-
24
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
=======
=======
-
24
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
-
25
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 57a2e05 (Add login registration pages)
=======
=======
-
24
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
=======
=======
-
24
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
=======
-
25
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> cacbab9 (Add login registration pages)
=======
-
25
>>>>>>> a5d032d (Fix)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> e50f73e (Add login registration pages)
=======
>>>>>>> ee78f39 (Rebased)
@books_count = Book.count
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> df37394 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 22ee41c (Add login registration pages)
<<<<<<< HEAD
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> e50f73e (Add login registration pages)
-
24
<<<<<<< HEAD
=======
=======
-
25
>>>>>>> 1214e1f (Add login registration pages)
=======
-
24
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
>>>>>>> 5c33a07 (Featire specs)
=======
=======
-
24
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e50f73e (Add login registration pages)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
=======
-
25
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 22ee41c (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ee78f39 (Rebased)
=======
-
25
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
>>>>>>> cacbab9 (Add login registration pages)
-
25
=======
-
24
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
=======
=======
-
24
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
=======
=======
-
24
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
=======
-
24
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
=======
=======
-
24
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
-
25
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 57a2e05 (Add login registration pages)
=======
=======
-
24
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
=======
=======
-
24
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
=======
-
25
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> cacbab9 (Add login registration pages)
=======
-
25
>>>>>>> a5d032d (Fix)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> e50f73e (Add login registration pages)
=======
>>>>>>> ee78f39 (Rebased)
@categories = Category.all
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> ee78f39 (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> e50f73e (Add login registration pages)
>>>>>>> 5c33a07 (Featire specs)
-
24
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 22ee41c (Add login registration pages)
=======
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 22ee41c (Add login registration pages)
>>>>>>> e50f73e (Add login registration pages)
-
24
=======
-
25
>>>>>>> 1214e1f (Add login registration pages)
=======
-
24
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e50f73e (Add login registration pages)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
=======
-
25
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 22ee41c (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ee78f39 (Rebased)
=======
-
25
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
>>>>>>> cacbab9 (Add login registration pages)
-
25
=======
-
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
=======
=======
-
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
=======
=======
-
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
=======
-
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
=======
=======
-
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
=======
-
25
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
sorted_books = BookQuery.query(params).paginate(page: params[:page],
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
sorted_books = BookQuery.query(params).paginate(page: params[:page],
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
-
=======
-
24
>>>>>>> d0dc1f1 (Featire specs)
=======
-
24
>>>>>>> 752f0c0 (Featire specs)
=======
-
24
>>>>>>> 4e81ea2 (Featire specs)
=======
-
24
>>>>>>> 08edf50 (Featire specs)
=======
-
24
>>>>>>> 7a02bbe (Featire specs)
=======
-
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
per_page: PAGINATION_PER_PAGE)
>>>>>>> d96cf3b (Featire specs)
=======
=======
>>>>>>> 83979de (Featire specs)
=======
>>>>>>> b3f2049 (Featire specs)
=======
>>>>>>> 12bcf81 (Featire specs)
=======
>>>>>>> fd3e35e (Featire specs)
=======
>>>>>>> 1677b1a (Featire specs)
=======
>>>>>>> b28889f (Fix)
per_page: Constants::PAGINATION_PER_PAGE)
=======
@books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE)
>>>>>>> d0dc1f1 (Featire specs)
=======
@books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE)
>>>>>>> 752f0c0 (Featire specs)
=======
@books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE)
>>>>>>> 4e81ea2 (Featire specs)
=======
@books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE)
>>>>>>> 08edf50 (Featire specs)
=======
@books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE)
>>>>>>> 7a02bbe (Featire specs)
=======
per_page: Constants::PAGINATION_PER_PAGE)
>>>>>>> a5d032d (Fix)
-
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a5d032d (Fix)
-
25
<<<<<<< HEAD
<<<<<<< HEAD
@books = BookDecorator.decorate_collection(sorted_books)
<<<<<<< HEAD
>>>>>>> d780a52 (Rebased)
=======
=======
=======
@books = BookDecorator.decorate_collection(sorted_books)
=======
>>>>>>> cb74525 (Add login registration pages)
def index
-
25
@books_count = Book.count
-
25
@categories = Category.all
-
25
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 852864e (Add login registration pages)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
-
24
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8be9029 (Add login registration pages)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
>>>>>>> 551f3c1 (Add login registration pages)
=======
-
25
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 551f3c1 (Add login registration pages)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
-
24
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 7d58507 (Add login registration pages)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> a624084 (Add login registration pages)
>>>>>>> ccec311 (Add login registration pages)
=======
-
25
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> e50f73e (Add login registration pages)
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> cb74525 (Add login registration pages)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8be9029 (Add login registration pages)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7d58507 (Add login registration pages)
=======
=======
>>>>>>> ccec311 (Add login registration pages)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> f182ac7 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 852864e (Add login registration pages)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 551f3c1 (Add login registration pages)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> a624084 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> ccec311 (Add login registration pages)
=======
=======
=======
-
24
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
=======
=======
-
25
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 6a9fede (Add login registration pages)
>>>>>>> 8c3e531 (Add login registration pages)
sorted_books = BookQuery.query(params).paginate(page: params[:page],
<<<<<<< HEAD
-
=======
-
>>>>>>> cb74525 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
per_page: PAGINATION_PER_PAGE)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 264ef06 (Add login registration pages)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c54769d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c346782 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
@books = BookDecorator.decorate_collection(sorted_books)
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
=======
per_page: Constants::PAGINATION_PER_PAGE)
-
-
25
@books = BookDecorator.decorate_collection(sorted_books)
>>>>>>> ee78f39 (Rebased)
=======
per_page: PAGINATION_PER_PAGE)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
>>>>>>> cb74525 (Add login registration pages)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
@books = BookDecorator.decorate_collection(sorted_books)
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> f182ac7 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 852864e (Add login registration pages)
=======
=======
>>>>>>> 1214e1f (Add login registration pages)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
=======
@books = BookDecorator.decorate_collection(sorted_books)
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
-
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
=======
=======
=======
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
-
>>>>>>> 752f0c0 (Featire specs)
=======
-
>>>>>>> 4e81ea2 (Featire specs)
=======
-
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
>>>>>>> 5c33a07 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c033601 (Rebased)
=======
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c033601 (Rebased)
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> ee78f39 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
-
=======
-
>>>>>>> 752f0c0 (Featire specs)
=======
-
>>>>>>> 4e81ea2 (Featire specs)
24
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
>>>>>>> cacbab9 (Add login registration pages)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a624084 (Add login registration pages)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6a9fede (Add login registration pages)
-
25
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1214e1f (Add login registration pages)
=======
-
24
>>>>>>> 08edf50 (Featire specs)
=======
-
24
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> d780a52 (Rebased)
=======
>>>>>>> c54769d (Fix book_spec decrease quantity and price)
=======
>>>>>>> a1a8477 (Add login registration pages)
=======
>>>>>>> c346782 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 551615f (Add login registration pages)
=======
>>>>>>> b28889f (Fix)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 22ee41c (Add login registration pages)
-
24
<<<<<<< HEAD
=======
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
>>>>>>> cacbab9 (Add login registration pages)
-
25
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 22ee41c (Add login registration pages)
-
24
<<<<<<< HEAD
=======
=======
-
25
>>>>>>> df37394 (Featire specs)
>>>>>>> 1214e1f (Add login registration pages)
=======
-
24
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> d96cf3b (Featire specs)
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
=======
-
24
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 551f3c1 (Add login registration pages)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> f764a87 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> e50f73e (Add login registration pages)
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
-
25
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 22ee41c (Add login registration pages)
<<<<<<< HEAD
>>>>>>> b6a32ab (Add login registration pages)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> e50f73e (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
@books = BookDecorator.decorate_collection(sorted_books)
=======
=======
@books = BookDecorator.decorate_collection(sorted_books)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
@books = BookDecorator.decorate_collection(sorted_books)
=======
>>>>>>> d96cf3b (Featire specs)
@books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE)
>>>>>>> 752f0c0 (Featire specs)
=======
@books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE)
>>>>>>> 4e81ea2 (Featire specs)
=======
@books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE)
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
@books = BookDecorator.decorate_collection(sorted_books)
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> d96cf3b (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
=======
@books = BookDecorator.decorate_collection(sorted_books)
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> f764a87 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
-
=======
=======
-
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
-
=======
>>>>>>> d96cf3b (Featire specs)
-
>>>>>>> 752f0c0 (Featire specs)
=======
-
>>>>>>> 4e81ea2 (Featire specs)
=======
-
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
-
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> d96cf3b (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
=======
-
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> f764a87 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
-
=======
-
>>>>>>> 752f0c0 (Featire specs)
=======
-
>>>>>>> 4e81ea2 (Featire specs)
24
=======
-
25
>>>>>>> 1214e1f (Add login registration pages)
=======
-
24
>>>>>>> 08edf50 (Featire specs)
=======
-
24
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
-
25
>>>>>>> aca90e3 (Rebased)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 22ee41c (Add login registration pages)
<<<<<<< HEAD
=======
>>>>>>> 5c33a07 (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> e50f73e (Add login registration pages)
-
24
<<<<<<< HEAD
=======
=======
-
25
>>>>>>> 1214e1f (Add login registration pages)
=======
-
24
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d96cf3b (Featire specs)
=======
=======
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
=======
-
24
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> f764a87 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> e50f73e (Add login registration pages)
=======
=======
-
25
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 22ee41c (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b6a32ab (Add login registration pages)
=======
=======
>>>>>>> ee78f39 (Rebased)
=======
-
25
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d780a52 (Rebased)
=======
=======
<<<<<<< HEAD
=======
=======
>>>>>>> cb74525 (Add login registration pages)
>>>>>>> 9ec6862 (Add login registration pages)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> f182ac7 (Add login registration pages)
=======
-
24
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 83979de (Featire specs)
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
-
24
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
=======
-
24
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 12bcf81 (Featire specs)
=======
=======
=======
=======
-
24
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
-
25
>>>>>>> 730a8ca (Add login registration pages)
=======
-
24
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
-
25
>>>>>>> e1f4d17 (Add login registration pages)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
@books = BookDecorator.decorate_collection(sorted_books)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
@books = BookDecorator.decorate_collection(sorted_books)
=======
@books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE)
>>>>>>> 752f0c0 (Featire specs)
=======
@books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE)
>>>>>>> 4e81ea2 (Featire specs)
=======
@books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE)
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
-
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
-
=======
-
>>>>>>> 752f0c0 (Featire specs)
=======
-
>>>>>>> 4e81ea2 (Featire specs)
=======
-
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
-
25
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 9ec6862 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 264ef06 (Add login registration pages)
=======
=======
=======
-
24
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3e35e (Featire specs)
=======
=======
=======
-
24
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c54769d (Fix book_spec decrease quantity and price)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
-
24
<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
=======
=======
-
25
<<<<<<< HEAD
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 57a2e05 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> a1a8477 (Add login registration pages)
=======
=======
=======
-
24
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 1677b1a (Featire specs)
=======
=======
=======
-
24
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c346782 (Fix book_spec decrease quantity and price)
=======
=======
=======
-
25
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> cacbab9 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 551615f (Add login registration pages)
=======
=======
-
25
>>>>>>> a5d032d (Fix)
>>>>>>> b28889f (Fix)
=======
>>>>>>> 1214e1f (Add login registration pages)
=======
-
24
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> e50f73e (Add login registration pages)
=======
>>>>>>> ee78f39 (Rebased)
=======
=======
=======
-
24
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
=======
=======
-
24
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 563720e (Featire specs)
=======
=======
=======
-
24
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9bf83f (Featire specs)
=======
=======
=======
<<<<<<< HEAD
=======
-
24
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
-
25
>>>>>>> 730a8ca (Add login registration pages)
=======
-
24
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a624084 (Add login registration pages)
=======
-
25
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> f182ac7 (Add login registration pages)
=======
-
24
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a624084 (Add login registration pages)
=======
=======
-
24
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
=======
-
25
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 6a9fede (Add login registration pages)
@books = BookDecorator.decorate_collection(sorted_books)
-
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a624084 (Add login registration pages)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6a9fede (Add login registration pages)
-
25
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9ec6862 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> cb74525 (Add login registration pages)
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
-
24
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
-
24
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
-
25
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 57a2e05 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 8be9029 (Add login registration pages)
=======
=======
=======
>>>>>>> 3b03895 (Featire specs)
=======
-
24
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
-
24
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> a624084 (Add login registration pages)
=======
-
25
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> cacbab9 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 7d58507 (Add login registration pages)
=======
=======
-
25
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
-
25
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> f182ac7 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 852864e (Add login registration pages)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 551f3c1 (Add login registration pages)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> a624084 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> ccec311 (Add login registration pages)
=======
=======
=======
-
24
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
=======
-
24
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
=======
=======
-
25
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 6a9fede (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 8c3e531 (Add login registration pages)
=======
=======
-
25
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
respond_to do |format|
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
-
=======
-
>>>>>>> 752f0c0 (Featire specs)
=======
-
>>>>>>> 4e81ea2 (Featire specs)
24
=======
-
25
>>>>>>> 1214e1f (Add login registration pages)
=======
-
24
>>>>>>> 08edf50 (Featire specs)
=======
-
24
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
-
25
>>>>>>> aca90e3 (Rebased)
=======
=======
>>>>>>> d780a52 (Rebased)
=======
>>>>>>> 83979de (Featire specs)
=======
>>>>>>> b3f2049 (Featire specs)
=======
>>>>>>> 12bcf81 (Featire specs)
=======
>>>>>>> 264ef06 (Add login registration pages)
=======
>>>>>>> fd3e35e (Featire specs)
=======
=======
>>>>>>> a1a8477 (Add login registration pages)
=======
>>>>>>> 1677b1a (Featire specs)
=======
>>>>>>> c346782 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 551615f (Add login registration pages)
=======
>>>>>>> b28889f (Fix)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 852864e (Add login registration pages)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> 551f3c1 (Add login registration pages)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> ccec311 (Add login registration pages)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8c3e531 (Add login registration pages)
=======
>>>>>>> 1d59aaa (Fix)
=======
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
>>>>>>> cacbab9 (Add login registration pages)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> f182ac7 (Add login registration pages)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a624084 (Add login registration pages)
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6a9fede (Add login registration pages)
-
25
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> c54769d (Fix book_spec decrease quantity and price)
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> cb74525 (Add login registration pages)
=======
>>>>>>> 904663c (Featire specs)
=======
=======
>>>>>>> 8be9029 (Add login registration pages)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7d58507 (Add login registration pages)
=======
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
>>>>>>> cacbab9 (Add login registration pages)
-
25
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 22ee41c (Add login registration pages)
-
24
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 22ee41c (Add login registration pages)
-
24
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
=======
=======
-
25
>>>>>>> 1214e1f (Add login registration pages)
=======
-
24
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> d96cf3b (Featire specs)
=======
=======
<<<<<<< HEAD
=======
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
-
24
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 551f3c1 (Add login registration pages)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 8be9029 (Add login registration pages)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> f764a87 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
-
25
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8be9029 (Add login registration pages)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 551f3c1 (Add login registration pages)
=======
>>>>>>> a9e66e9 (Featire specs)
>>>>>>> 22ee41c (Add login registration pages)
<<<<<<< HEAD
>>>>>>> b6a32ab (Add login registration pages)
=======
=======
-
25
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> d780a52 (Rebased)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 9ec6862 (Add login registration pages)
=======
>>>>>>> 3723aad (Featire specs)
-
25
=======
-
25
>>>>>>> 9620751 (Featire specs)
=======
-
24
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 83979de (Featire specs)
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
-
24
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
=======
-
24
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 12bcf81 (Featire specs)
=======
=======
=======
>>>>>>> f182ac7 (Add login registration pages)
=======
-
25
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9ec6862 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 264ef06 (Add login registration pages)
=======
=======
=======
-
24
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fd3e35e (Featire specs)
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c54769d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 57a2e05 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a1a8477 (Add login registration pages)
=======
=======
>>>>>>> e5752db (Featire specs)
=======
=======
>>>>>>> 3b03895 (Featire specs)
=======
-
24
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 1677b1a (Featire specs)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
-
24
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> ccec311 (Add login registration pages)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c346782 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 7d58507 (Add login registration pages)
=======
=======
>>>>>>> a624084 (Add login registration pages)
=======
-
25
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> cacbab9 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 551615f (Add login registration pages)
=======
=======
>>>>>>> 872e675 (Fix)
=======
-
25
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
=======
=======
-
24
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
=======
=======
-
25
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 22ee41c (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e50f73e (Add login registration pages)
=======
=======
-
25
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> ee78f39 (Rebased)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 9ec6862 (Add login registration pages)
=======
>>>>>>> 3723aad (Featire specs)
-
25
=======
-
24
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
=======
=======
-
24
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 563720e (Featire specs)
=======
=======
=======
-
24
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9bf83f (Featire specs)
=======
=======
=======
-
25
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 9ec6862 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> cb74525 (Add login registration pages)
=======
=======
=======
-
24
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 57a2e05 (Add login registration pages)
>>>>>>> 8be9029 (Add login registration pages)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7d58507 (Add login registration pages)
=======
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> f182ac7 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 852864e (Add login registration pages)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 551f3c1 (Add login registration pages)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> a624084 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> ccec311 (Add login registration pages)
=======
=======
=======
-
24
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
=======
-
24
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
=======
=======
-
25
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 6a9fede (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 8c3e531 (Add login registration pages)
=======
=======
-
25
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
format.html
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
-
=======
-
>>>>>>> 752f0c0 (Featire specs)
=======
-
>>>>>>> 4e81ea2 (Featire specs)
24
=======
-
25
>>>>>>> 1214e1f (Add login registration pages)
=======
-
24
>>>>>>> 08edf50 (Featire specs)
=======
-
24
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
-
25
>>>>>>> aca90e3 (Rebased)
=======
=======
>>>>>>> d780a52 (Rebased)
=======
>>>>>>> 83979de (Featire specs)
=======
>>>>>>> b3f2049 (Featire specs)
=======
>>>>>>> 12bcf81 (Featire specs)
=======
>>>>>>> 264ef06 (Add login registration pages)
=======
>>>>>>> fd3e35e (Featire specs)
=======
=======
>>>>>>> a1a8477 (Add login registration pages)
=======
>>>>>>> 1677b1a (Featire specs)
=======
>>>>>>> c346782 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 551615f (Add login registration pages)
=======
>>>>>>> b28889f (Fix)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 852864e (Add login registration pages)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> 551f3c1 (Add login registration pages)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> ccec311 (Add login registration pages)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8c3e531 (Add login registration pages)
=======
>>>>>>> 1d59aaa (Fix)
=======
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
>>>>>>> cacbab9 (Add login registration pages)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> f182ac7 (Add login registration pages)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a624084 (Add login registration pages)
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6a9fede (Add login registration pages)
-
25
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> c54769d (Fix book_spec decrease quantity and price)
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> cb74525 (Add login registration pages)
=======
>>>>>>> 904663c (Featire specs)
=======
=======
>>>>>>> 8be9029 (Add login registration pages)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7d58507 (Add login registration pages)
=======
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
>>>>>>> cacbab9 (Add login registration pages)
-
25
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 22ee41c (Add login registration pages)
-
24
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 22ee41c (Add login registration pages)
-
24
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
=======
=======
-
25
>>>>>>> 1214e1f (Add login registration pages)
=======
-
24
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> d96cf3b (Featire specs)
=======
=======
<<<<<<< HEAD
=======
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
-
24
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 551f3c1 (Add login registration pages)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 8be9029 (Add login registration pages)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> f764a87 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
-
25
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8be9029 (Add login registration pages)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 551f3c1 (Add login registration pages)
=======
>>>>>>> a9e66e9 (Featire specs)
>>>>>>> 22ee41c (Add login registration pages)
<<<<<<< HEAD
>>>>>>> b6a32ab (Add login registration pages)
=======
=======
-
25
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> d780a52 (Rebased)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 9ec6862 (Add login registration pages)
=======
>>>>>>> 3723aad (Featire specs)
-
25
=======
-
25
>>>>>>> 9620751 (Featire specs)
=======
-
24
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 83979de (Featire specs)
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
-
24
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
=======
-
24
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 12bcf81 (Featire specs)
=======
=======
=======
>>>>>>> f182ac7 (Add login registration pages)
=======
-
25
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9ec6862 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 264ef06 (Add login registration pages)
=======
=======
=======
-
24
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fd3e35e (Featire specs)
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c54769d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 57a2e05 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a1a8477 (Add login registration pages)
=======
=======
>>>>>>> e5752db (Featire specs)
=======
=======
>>>>>>> 3b03895 (Featire specs)
=======
-
24
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 1677b1a (Featire specs)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
-
24
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> ccec311 (Add login registration pages)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c346782 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 7d58507 (Add login registration pages)
=======
=======
>>>>>>> a624084 (Add login registration pages)
=======
-
25
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> cacbab9 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 551615f (Add login registration pages)
=======
=======
>>>>>>> 872e675 (Fix)
=======
-
25
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
=======
=======
-
24
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
=======
=======
-
25
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 22ee41c (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e50f73e (Add login registration pages)
=======
=======
-
25
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> ee78f39 (Rebased)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 9ec6862 (Add login registration pages)
=======
>>>>>>> 3723aad (Featire specs)
-
25
=======
-
24
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
=======
=======
-
24
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 563720e (Featire specs)
=======
=======
=======
-
24
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9bf83f (Featire specs)
=======
=======
=======
-
25
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 9ec6862 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> cb74525 (Add login registration pages)
=======
=======
=======
-
24
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 57a2e05 (Add login registration pages)
>>>>>>> 8be9029 (Add login registration pages)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7d58507 (Add login registration pages)
=======
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> f182ac7 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 852864e (Add login registration pages)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 551f3c1 (Add login registration pages)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> a624084 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> ccec311 (Add login registration pages)
=======
=======
=======
-
24
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
=======
-
24
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
=======
=======
-
25
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 6a9fede (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 8c3e531 (Add login registration pages)
=======
=======
-
25
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
format.json do
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
-
=======
=======
>>>>>>> d780a52 (Rebased)
=======
>>>>>>> 83979de (Featire specs)
=======
>>>>>>> b3f2049 (Featire specs)
=======
>>>>>>> 12bcf81 (Featire specs)
=======
>>>>>>> fd3e35e (Featire specs)
=======
>>>>>>> c54769d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1677b1a (Featire specs)
=======
>>>>>>> c346782 (Fix book_spec decrease quantity and price)
=======
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1d59aaa (Fix)
-
=======
-
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
-
>>>>>>> 94841b5 (Featire specs)
=======
-
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
-
>>>>>>> 3b03895 (Featire specs)
=======
-
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
-
>>>>>>> e54deeb (Featire specs)
=======
-
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
-
>>>>>>> 9c0d812 (Featire specs)
=======
-
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
-
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
=======
-
=======
>>>>>>> df37394 (Featire specs)
=======
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
-
=======
-
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
-
>>>>>>> 9c0d812 (Featire specs)
=======
-
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
-
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
-
=======
-
>>>>>>> 752f0c0 (Featire specs)
=======
-
>>>>>>> 4e81ea2 (Featire specs)
=======
-
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> d96cf3b (Featire specs)
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
=======
-
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> a9e66e9 (Featire specs)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f764a87 (Fix book_spec decrease quantity and price)
=======
=======
-
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d780a52 (Rebased)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
-
=======
-
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 83979de (Featire specs)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
=======
-
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> a9bf83f (Featire specs)
=======
=======
-
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 12bcf81 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fd3e35e (Featire specs)
=======
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
-
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c54769d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> e5752db (Featire specs)
=======
=======
-
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 1677b1a (Featire specs)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
-
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c346782 (Fix book_spec decrease quantity and price)
=======
=======
-
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
=======
-
>>>>>>> c033601 (Rebased)
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
-
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
=======
=======
-
=======
-
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
=======
=======
-
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
=======
-
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
=======
-
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
=======
-
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
=======
-
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
=======
-
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
=======
-
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
=======
-
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
1
render json: {
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
-
=======
=======
>>>>>>> d780a52 (Rebased)
=======
>>>>>>> 83979de (Featire specs)
=======
>>>>>>> b3f2049 (Featire specs)
=======
>>>>>>> 12bcf81 (Featire specs)
=======
>>>>>>> fd3e35e (Featire specs)
=======
>>>>>>> c54769d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1677b1a (Featire specs)
=======
>>>>>>> c346782 (Fix book_spec decrease quantity and price)
=======
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1d59aaa (Fix)
-
=======
-
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
-
>>>>>>> 94841b5 (Featire specs)
=======
-
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
-
>>>>>>> 3b03895 (Featire specs)
=======
-
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
-
>>>>>>> e54deeb (Featire specs)
=======
-
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
-
>>>>>>> 9c0d812 (Featire specs)
=======
-
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
-
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
=======
-
=======
>>>>>>> df37394 (Featire specs)
=======
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
-
=======
-
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
-
>>>>>>> 9c0d812 (Featire specs)
=======
-
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
-
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
-
=======
-
>>>>>>> 752f0c0 (Featire specs)
=======
-
>>>>>>> 4e81ea2 (Featire specs)
=======
-
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> d96cf3b (Featire specs)
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
=======
-
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> a9e66e9 (Featire specs)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f764a87 (Fix book_spec decrease quantity and price)
=======
=======
-
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d780a52 (Rebased)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
-
=======
-
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 83979de (Featire specs)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
=======
-
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> a9bf83f (Featire specs)
=======
=======
-
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 12bcf81 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fd3e35e (Featire specs)
=======
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
-
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c54769d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> e5752db (Featire specs)
=======
=======
-
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 1677b1a (Featire specs)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
-
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c346782 (Fix book_spec decrease quantity and price)
=======
=======
-
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
=======
-
>>>>>>> c033601 (Rebased)
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
-
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
=======
=======
-
=======
-
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
=======
=======
-
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
=======
-
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
=======
-
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
=======
-
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
=======
-
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
=======
-
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
=======
-
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
=======
-
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
entries: render_to_string(partial: 'books/index/books', formats: [:html]),
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
-
=======
=======
>>>>>>> d780a52 (Rebased)
=======
>>>>>>> 83979de (Featire specs)
=======
>>>>>>> b3f2049 (Featire specs)
=======
>>>>>>> 12bcf81 (Featire specs)
=======
>>>>>>> fd3e35e (Featire specs)
=======
>>>>>>> c54769d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1677b1a (Featire specs)
=======
>>>>>>> c346782 (Fix book_spec decrease quantity and price)
=======
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1d59aaa (Fix)
-
=======
-
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
-
>>>>>>> 94841b5 (Featire specs)
=======
-
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
-
>>>>>>> 3b03895 (Featire specs)
=======
-
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
-
>>>>>>> e54deeb (Featire specs)
=======
-
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
-
>>>>>>> 9c0d812 (Featire specs)
=======
-
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
-
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
=======
-
=======
>>>>>>> df37394 (Featire specs)
=======
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
-
=======
-
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
-
>>>>>>> 9c0d812 (Featire specs)
=======
-
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
-
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
-
=======
-
>>>>>>> 752f0c0 (Featire specs)
=======
-
>>>>>>> 4e81ea2 (Featire specs)
=======
-
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> d96cf3b (Featire specs)
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
=======
-
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> a9e66e9 (Featire specs)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f764a87 (Fix book_spec decrease quantity and price)
=======
=======
-
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d780a52 (Rebased)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
-
=======
-
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 83979de (Featire specs)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
=======
-
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> a9bf83f (Featire specs)
=======
=======
-
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 12bcf81 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fd3e35e (Featire specs)
=======
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
-
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c54769d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> e5752db (Featire specs)
=======
=======
-
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 1677b1a (Featire specs)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
-
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c346782 (Fix book_spec decrease quantity and price)
=======
=======
-
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
=======
-
>>>>>>> c033601 (Rebased)
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
-
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
=======
=======
-
=======
-
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
=======
=======
-
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
=======
-
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
=======
-
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
=======
-
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
=======
-
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
=======
-
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
=======
-
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
=======
-
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
pagination: view_context.will_paginate(@books)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
-
=======
=======
>>>>>>> d780a52 (Rebased)
=======
>>>>>>> 83979de (Featire specs)
=======
>>>>>>> b3f2049 (Featire specs)
=======
>>>>>>> 12bcf81 (Featire specs)
=======
>>>>>>> fd3e35e (Featire specs)
=======
>>>>>>> c54769d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1677b1a (Featire specs)
=======
>>>>>>> c346782 (Fix book_spec decrease quantity and price)
=======
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1d59aaa (Fix)
-
=======
-
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
-
>>>>>>> 94841b5 (Featire specs)
=======
-
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
-
>>>>>>> 3b03895 (Featire specs)
=======
-
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
-
>>>>>>> e54deeb (Featire specs)
=======
-
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
-
>>>>>>> 9c0d812 (Featire specs)
=======
-
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
-
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
=======
-
=======
>>>>>>> df37394 (Featire specs)
=======
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
-
=======
-
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
-
>>>>>>> 9c0d812 (Featire specs)
=======
-
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
-
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
-
=======
-
>>>>>>> 752f0c0 (Featire specs)
=======
-
>>>>>>> 4e81ea2 (Featire specs)
=======
-
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> d96cf3b (Featire specs)
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
=======
-
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> a9e66e9 (Featire specs)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f764a87 (Fix book_spec decrease quantity and price)
=======
=======
-
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d780a52 (Rebased)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
-
=======
-
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 83979de (Featire specs)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
=======
-
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> a9bf83f (Featire specs)
=======
=======
-
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 12bcf81 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fd3e35e (Featire specs)
=======
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
-
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c54769d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> e5752db (Featire specs)
=======
=======
-
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 1677b1a (Featire specs)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
-
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c346782 (Fix book_spec decrease quantity and price)
=======
=======
-
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
=======
-
>>>>>>> c033601 (Rebased)
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
-
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
=======
=======
-
=======
-
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
=======
=======
-
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
=======
-
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
=======
-
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
=======
-
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
=======
-
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
=======
-
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
=======
-
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
=======
-
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
=======
<<<<<<< HEAD
=======
>>>>>>> d6f7da8 (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> dacfb20 (Featire specs)
=======
=======
>>>>>>> 78d0719 (Featire specs)
}
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
-
=======
=======
>>>>>>> d780a52 (Rebased)
=======
>>>>>>> 83979de (Featire specs)
=======
>>>>>>> b3f2049 (Featire specs)
=======
>>>>>>> 12bcf81 (Featire specs)
=======
>>>>>>> fd3e35e (Featire specs)
=======
>>>>>>> c54769d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1677b1a (Featire specs)
=======
>>>>>>> c346782 (Fix book_spec decrease quantity and price)
=======
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1d59aaa (Fix)
-
=======
-
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
-
>>>>>>> 94841b5 (Featire specs)
=======
-
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
-
>>>>>>> 3b03895 (Featire specs)
=======
-
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
-
>>>>>>> e54deeb (Featire specs)
=======
-
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
-
>>>>>>> 9c0d812 (Featire specs)
=======
-
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
-
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
=======
-
=======
>>>>>>> df37394 (Featire specs)
=======
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
-
=======
-
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
-
>>>>>>> 9c0d812 (Featire specs)
=======
-
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
-
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
-
=======
-
>>>>>>> 752f0c0 (Featire specs)
=======
-
>>>>>>> 4e81ea2 (Featire specs)
=======
-
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> d96cf3b (Featire specs)
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
=======
-
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> a9e66e9 (Featire specs)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f764a87 (Fix book_spec decrease quantity and price)
=======
=======
-
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d780a52 (Rebased)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
-
=======
-
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 83979de (Featire specs)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
=======
-
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> a9bf83f (Featire specs)
=======
=======
-
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 12bcf81 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fd3e35e (Featire specs)
=======
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
-
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c54769d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> e5752db (Featire specs)
=======
=======
-
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 1677b1a (Featire specs)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
-
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c346782 (Fix book_spec decrease quantity and price)
=======
=======
-
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
=======
-
>>>>>>> c033601 (Rebased)
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
-
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
=======
=======
-
=======
-
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
=======
=======
-
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
=======
-
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
=======
-
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
=======
-
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
=======
-
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
=======
-
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
=======
-
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
=======
-
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
=======
-
>>>>>>> d6f7da8 (Featire specs)
=======
-
>>>>>>> dacfb20 (Featire specs)
=======
-
>>>>>>> 78d0719 (Featire specs)
end
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
-
=======
=======
>>>>>>> d780a52 (Rebased)
=======
>>>>>>> 83979de (Featire specs)
=======
>>>>>>> b3f2049 (Featire specs)
=======
>>>>>>> 12bcf81 (Featire specs)
=======
>>>>>>> fd3e35e (Featire specs)
=======
>>>>>>> c54769d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1677b1a (Featire specs)
=======
>>>>>>> c346782 (Fix book_spec decrease quantity and price)
=======
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1d59aaa (Fix)
-
=======
-
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
-
>>>>>>> 94841b5 (Featire specs)
=======
-
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
-
>>>>>>> 3b03895 (Featire specs)
=======
-
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
-
>>>>>>> e54deeb (Featire specs)
=======
-
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
-
>>>>>>> 9c0d812 (Featire specs)
=======
-
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
-
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
=======
-
=======
>>>>>>> df37394 (Featire specs)
=======
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
-
=======
-
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
-
>>>>>>> 9c0d812 (Featire specs)
=======
-
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
-
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
-
=======
-
>>>>>>> 752f0c0 (Featire specs)
=======
-
>>>>>>> 4e81ea2 (Featire specs)
=======
-
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> d96cf3b (Featire specs)
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
=======
-
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> a9e66e9 (Featire specs)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f764a87 (Fix book_spec decrease quantity and price)
=======
=======
-
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d780a52 (Rebased)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
-
=======
-
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 83979de (Featire specs)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
=======
-
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> a9bf83f (Featire specs)
=======
=======
-
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 12bcf81 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fd3e35e (Featire specs)
=======
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
-
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c54769d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> e5752db (Featire specs)
=======
=======
-
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 1677b1a (Featire specs)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
-
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c346782 (Fix book_spec decrease quantity and price)
=======
=======
-
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
=======
-
>>>>>>> c033601 (Rebased)
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
-
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
=======
=======
-
=======
-
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
=======
=======
-
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
=======
-
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
=======
-
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
=======
-
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
=======
-
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
=======
-
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
=======
-
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
=======
-
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
=======
-
>>>>>>> d6f7da8 (Featire specs)
=======
-
>>>>>>> dacfb20 (Featire specs)
=======
-
>>>>>>> 78d0719 (Featire specs)
end
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
-
=======
=======
>>>>>>> d780a52 (Rebased)
=======
>>>>>>> 83979de (Featire specs)
=======
>>>>>>> b3f2049 (Featire specs)
=======
>>>>>>> 12bcf81 (Featire specs)
=======
>>>>>>> fd3e35e (Featire specs)
=======
>>>>>>> c54769d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1677b1a (Featire specs)
=======
>>>>>>> c346782 (Fix book_spec decrease quantity and price)
=======
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1d59aaa (Fix)
-
=======
-
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
-
>>>>>>> 94841b5 (Featire specs)
=======
-
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
-
>>>>>>> 3b03895 (Featire specs)
=======
-
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
-
>>>>>>> e54deeb (Featire specs)
=======
-
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
-
>>>>>>> 9c0d812 (Featire specs)
=======
-
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
-
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
=======
-
=======
>>>>>>> df37394 (Featire specs)
=======
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
-
=======
-
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
-
>>>>>>> 9c0d812 (Featire specs)
=======
-
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
-
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
-
=======
-
>>>>>>> 752f0c0 (Featire specs)
=======
-
>>>>>>> 4e81ea2 (Featire specs)
=======
-
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> d96cf3b (Featire specs)
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
=======
-
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> a9e66e9 (Featire specs)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f764a87 (Fix book_spec decrease quantity and price)
=======
=======
-
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d780a52 (Rebased)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
-
=======
-
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 83979de (Featire specs)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
=======
-
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> a9bf83f (Featire specs)
=======
=======
-
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 12bcf81 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fd3e35e (Featire specs)
=======
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
-
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c54769d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> e5752db (Featire specs)
=======
=======
-
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 1677b1a (Featire specs)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
-
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c346782 (Fix book_spec decrease quantity and price)
=======
=======
-
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
=======
-
>>>>>>> c033601 (Rebased)
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
-
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
=======
=======
-
=======
-
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
=======
=======
-
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
=======
-
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
=======
-
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
=======
-
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
=======
-
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
=======
-
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
=======
-
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
=======
-
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
=======
-
>>>>>>> d6f7da8 (Featire specs)
=======
-
>>>>>>> dacfb20 (Featire specs)
=======
-
>>>>>>> 78d0719 (Featire specs)
end
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
-
=======
=======
>>>>>>> d780a52 (Rebased)
=======
>>>>>>> 83979de (Featire specs)
=======
>>>>>>> b3f2049 (Featire specs)
=======
>>>>>>> 12bcf81 (Featire specs)
=======
>>>>>>> fd3e35e (Featire specs)
=======
>>>>>>> c54769d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1677b1a (Featire specs)
=======
>>>>>>> c346782 (Fix book_spec decrease quantity and price)
=======
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1d59aaa (Fix)
-
=======
-
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
-
>>>>>>> 94841b5 (Featire specs)
=======
-
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
-
>>>>>>> 3b03895 (Featire specs)
=======
-
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
-
>>>>>>> e54deeb (Featire specs)
=======
-
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
-
>>>>>>> 9c0d812 (Featire specs)
=======
-
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
-
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
=======
-
=======
>>>>>>> df37394 (Featire specs)
=======
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
-
=======
-
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
-
>>>>>>> 9c0d812 (Featire specs)
=======
-
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
-
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
-
=======
-
>>>>>>> 752f0c0 (Featire specs)
=======
-
>>>>>>> 4e81ea2 (Featire specs)
=======
-
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> d96cf3b (Featire specs)
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
=======
-
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> a9e66e9 (Featire specs)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f764a87 (Fix book_spec decrease quantity and price)
=======
=======
-
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d780a52 (Rebased)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
-
=======
-
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 83979de (Featire specs)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
=======
-
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> a9bf83f (Featire specs)
=======
=======
-
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 12bcf81 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fd3e35e (Featire specs)
=======
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
-
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c54769d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> e5752db (Featire specs)
=======
=======
-
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 1677b1a (Featire specs)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
-
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c346782 (Fix book_spec decrease quantity and price)
=======
=======
-
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
=======
-
>>>>>>> c033601 (Rebased)
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
-
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
=======
=======
-
=======
-
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
=======
=======
-
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
=======
-
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
=======
-
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
=======
-
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
=======
-
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
=======
-
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
=======
-
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
=======
-
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
=======
-
>>>>>>> d6f7da8 (Featire specs)
=======
-
>>>>>>> dacfb20 (Featire specs)
=======
-
>>>>>>> 78d0719 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
-
=======
=======
>>>>>>> d780a52 (Rebased)
=======
>>>>>>> 83979de (Featire specs)
=======
>>>>>>> b3f2049 (Featire specs)
=======
>>>>>>> 12bcf81 (Featire specs)
=======
>>>>>>> fd3e35e (Featire specs)
=======
>>>>>>> c54769d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1677b1a (Featire specs)
=======
>>>>>>> c346782 (Fix book_spec decrease quantity and price)
=======
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1d59aaa (Fix)
-
=======
-
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
-
>>>>>>> 94841b5 (Featire specs)
=======
-
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
-
>>>>>>> 3b03895 (Featire specs)
=======
-
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
-
>>>>>>> e54deeb (Featire specs)
=======
-
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
-
>>>>>>> 9c0d812 (Featire specs)
=======
-
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
-
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
=======
-
=======
>>>>>>> df37394 (Featire specs)
=======
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
-
=======
-
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
-
>>>>>>> 9c0d812 (Featire specs)
=======
-
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
-
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
-
=======
-
>>>>>>> 752f0c0 (Featire specs)
=======
-
>>>>>>> 4e81ea2 (Featire specs)
=======
-
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> d96cf3b (Featire specs)
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
=======
-
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> a9e66e9 (Featire specs)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f764a87 (Fix book_spec decrease quantity and price)
=======
=======
-
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d780a52 (Rebased)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
-
=======
-
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 83979de (Featire specs)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
=======
-
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> a9bf83f (Featire specs)
=======
=======
-
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 12bcf81 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fd3e35e (Featire specs)
=======
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
-
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c54769d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> e5752db (Featire specs)
=======
=======
-
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 1677b1a (Featire specs)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
-
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c346782 (Fix book_spec decrease quantity and price)
=======
=======
-
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
=======
-
>>>>>>> c033601 (Rebased)
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
-
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
=======
=======
-
=======
-
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
=======
=======
-
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
=======
-
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
=======
-
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
=======
-
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
=======
-
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
=======
-
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
=======
-
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
=======
-
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
=======
-
>>>>>>> d6f7da8 (Featire specs)
=======
-
>>>>>>> dacfb20 (Featire specs)
=======
-
>>>>>>> 78d0719 (Featire specs)
1
def show
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
-
11
=======
=======
>>>>>>> d780a52 (Rebased)
=======
>>>>>>> 83979de (Featire specs)
=======
>>>>>>> b3f2049 (Featire specs)
=======
>>>>>>> 12bcf81 (Featire specs)
=======
>>>>>>> fd3e35e (Featire specs)
=======
>>>>>>> c54769d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1677b1a (Featire specs)
=======
>>>>>>> c346782 (Fix book_spec decrease quantity and price)
=======
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1d59aaa (Fix)
-
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
-
=======
-
>>>>>>> 752f0c0 (Featire specs)
=======
-
>>>>>>> 4e81ea2 (Featire specs)
=======
-
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
=======
-
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
7
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d96cf3b (Featire specs)
=======
=======
>>>>>>> ee78f39 (Rebased)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
-
11
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d780a52 (Rebased)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
-
11
=======
-
11
>>>>>>> 9620751 (Featire specs)
=======
-
<<<<<<< HEAD
<<<<<<< HEAD
=======
-
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
<<<<<<< HEAD
-
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4552227 (Featire specs)
=======
<<<<<<< HEAD
-
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
7
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 83979de (Featire specs)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
-
7
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> a9bf83f (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
=======
-
7
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 12bcf81 (Featire specs)
=======
=======
>>>>>>> b832d45 (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
-
7
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3e35e (Featire specs)
=======
=======
=======
=======
>>>>>>> df37394 (Featire specs)
-
=======
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
>>>>>>> 3723aad (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
-
7
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
-
7
>>>>>>> 7a02bbe (Featire specs)
=======
-
7
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
-
7
>>>>>>> 4552227 (Featire specs)
=======
-
7
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
=======
-
15
>>>>>>> 7c4ea7f (Fix)
=======
-
7
>>>>>>> d6f7da8 (Featire specs)
=======
-
7
>>>>>>> dacfb20 (Featire specs)
=======
-
7
>>>>>>> 78d0719 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
book = Book.find(params[:id])
<<<<<<< HEAD
>>>>>>> 3b03895 (Featire specs)
=======
=======
-
7
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
=======
=======
-
7
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
-
11
>>>>>>> a5d032d (Fix)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
@book = Book.find(params[:id]).decorate
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
book = Book.find_by(id: params[:id])
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
book = Book.find_by(id: params[:id])
>>>>>>> 9c0d812 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
-
=======
-
>>>>>>> 752f0c0 (Featire specs)
=======
-
>>>>>>> 4e81ea2 (Featire specs)
=======
-
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
=======
-
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
7
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c54769d (Fix book_spec decrease quantity and price)
=======
=======
=======
-
7
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 1677b1a (Featire specs)
=======
=======
=======
-
7
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c346782 (Fix book_spec decrease quantity and price)
=======
=======
-
11
>>>>>>> a5d032d (Fix)
>>>>>>> b28889f (Fix)
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
book = Book.find_by(id: params[:id])
=======
=======
>>>>>>> d780a52 (Rebased)
=======
>>>>>>> 83979de (Featire specs)
=======
>>>>>>> b3f2049 (Featire specs)
=======
>>>>>>> 12bcf81 (Featire specs)
=======
>>>>>>> fd3e35e (Featire specs)
=======
>>>>>>> c54769d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1677b1a (Featire specs)
=======
>>>>>>> c346782 (Fix book_spec decrease quantity and price)
=======
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
@book = Book.find(params[:id]).decorate
=======
book = Book.find_by(id: params[:id])
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
book = Book.find_by(id: params[:id])
>>>>>>> 9c0d812 (Featire specs)
=======
<<<<<<< HEAD
=======
@book = Book.find(params[:id]).decorate
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
@book = Book.find(params[:id]).decorate
=======
@book = Book.find_by(id: params[:id])
>>>>>>> 752f0c0 (Featire specs)
=======
@book = Book.find_by(id: params[:id])
>>>>>>> 4e81ea2 (Featire specs)
=======
@book = Book.find_by(id: params[:id])
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> d96cf3b (Featire specs)
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
=======
@book = Book.find(params[:id]).decorate
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f764a87 (Fix book_spec decrease quantity and price)
=======
=======
book = Book.find_by(id: params[:id])
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d780a52 (Rebased)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
book = Book.find_by(id: params[:id])
=======
@book = Book.find_by(id: params[:id])
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 83979de (Featire specs)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
=======
@book = Book.find_by(id: params[:id])
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> a9bf83f (Featire specs)
=======
=======
@book = Book.find_by(id: params[:id])
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 12bcf81 (Featire specs)
=======
=======
>>>>>>> b832d45 (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
=======
@book = Book.find_by(id: params[:id])
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3e35e (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
@book = Book.find(params[:id]).decorate
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c54769d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> e5752db (Featire specs)
=======
=======
@book = Book.find_by(id: params[:id])
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 1677b1a (Featire specs)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
@book = Book.find(params[:id]).decorate
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c346782 (Fix book_spec decrease quantity and price)
=======
=======
book = Book.find(params[:id])
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
=======
book = Book.find_by(id: params[:id])
>>>>>>> c033601 (Rebased)
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
book = Book.find(params[:id])
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
book = Book.find(params[:id])
=======
@book = Book.find_by(id: params[:id])
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
=======
=======
@book = Book.find_by(id: params[:id])
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
=======
@book = Book.find_by(id: params[:id])
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
=======
@book = Book.find_by(id: params[:id])
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
=======
@book = Book.find(params[:id]).decorate
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
=======
@book = Book.find_by(id: params[:id])
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
=======
@book = Book.find(params[:id]).decorate
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
=======
@book = Book.find_by(id: params[:id])
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
=======
@book = Book.find(params[:id]).decorate
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
=======
@book = Book.find_by(id: params[:id])
>>>>>>> d6f7da8 (Featire specs)
=======
=======
>>>>>>> 6d21330 (Featire specs)
=======
>>>>>>> a2a431e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 27e3351 (Featire specs)
=======
>>>>>>> e733663 (Fix book_spec decrease quantity and price)
@book = Book.find_by(id: params[:id])
=======
@book = Book.find(params[:id]).decorate
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> da83d1a (Fix book_spec decrease quantity and price)
=======
=======
@book = Book.find_by(id: params[:id])
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 6d21330 (Featire specs)
=======
=======
@book = Book.find(params[:id]).decorate
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2a431e (Fix book_spec decrease quantity and price)
=======
=======
@book = Book.find_by(id: params[:id])
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 27e3351 (Featire specs)
=======
=======
@book = Book.find(params[:id]).decorate
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> e733663 (Fix book_spec decrease quantity and price)
=======
@book = Book.find_by(id: params[:id])
>>>>>>> dacfb20 (Featire specs)
=======
@book = Book.find_by(id: params[:id])
>>>>>>> 78d0719 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
-
=======
=======
>>>>>>> d780a52 (Rebased)
=======
>>>>>>> 83979de (Featire specs)
=======
>>>>>>> b3f2049 (Featire specs)
=======
>>>>>>> 12bcf81 (Featire specs)
=======
>>>>>>> fd3e35e (Featire specs)
=======
>>>>>>> c54769d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1677b1a (Featire specs)
=======
>>>>>>> c346782 (Fix book_spec decrease quantity and price)
=======
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1d59aaa (Fix)
-
=======
-
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
-
>>>>>>> 94841b5 (Featire specs)
=======
-
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
-
>>>>>>> 3b03895 (Featire specs)
=======
-
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
-
>>>>>>> e54deeb (Featire specs)
=======
-
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
-
>>>>>>> 9c0d812 (Featire specs)
=======
-
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
-
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
=======
-
=======
>>>>>>> df37394 (Featire specs)
=======
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
-
=======
-
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
-
>>>>>>> 9c0d812 (Featire specs)
=======
-
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
-
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
-
=======
-
>>>>>>> 752f0c0 (Featire specs)
=======
-
>>>>>>> 4e81ea2 (Featire specs)
=======
-
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> d96cf3b (Featire specs)
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
=======
-
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> a9e66e9 (Featire specs)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f764a87 (Fix book_spec decrease quantity and price)
=======
=======
-
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d780a52 (Rebased)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
-
=======
-
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 83979de (Featire specs)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
=======
-
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> a9bf83f (Featire specs)
=======
=======
-
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 12bcf81 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fd3e35e (Featire specs)
=======
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
-
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c54769d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> e5752db (Featire specs)
=======
=======
-
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 1677b1a (Featire specs)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
-
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c346782 (Fix book_spec decrease quantity and price)
=======
=======
-
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
=======
-
>>>>>>> c033601 (Rebased)
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
-
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
=======
=======
-
=======
-
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
=======
=======
-
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
=======
-
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
=======
-
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
=======
-
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
=======
-
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
=======
-
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
=======
-
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
=======
-
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
=======
-
>>>>>>> d6f7da8 (Featire specs)
=======
=======
>>>>>>> 6d21330 (Featire specs)
=======
>>>>>>> a2a431e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 27e3351 (Featire specs)
=======
>>>>>>> e733663 (Fix book_spec decrease quantity and price)
-
=======
-
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> da83d1a (Fix book_spec decrease quantity and price)
=======
=======
-
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 6d21330 (Featire specs)
=======
=======
-
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2a431e (Fix book_spec decrease quantity and price)
=======
=======
-
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 27e3351 (Featire specs)
=======
=======
-
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> e733663 (Fix book_spec decrease quantity and price)
=======
-
>>>>>>> dacfb20 (Featire specs)
=======
-
>>>>>>> 78d0719 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
-
11
=======
=======
>>>>>>> d780a52 (Rebased)
=======
>>>>>>> 83979de (Featire specs)
=======
>>>>>>> b3f2049 (Featire specs)
=======
>>>>>>> 12bcf81 (Featire specs)
=======
>>>>>>> fd3e35e (Featire specs)
=======
>>>>>>> c54769d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1677b1a (Featire specs)
=======
>>>>>>> c346782 (Fix book_spec decrease quantity and price)
=======
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1d59aaa (Fix)
-
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
-
=======
-
>>>>>>> 752f0c0 (Featire specs)
=======
-
>>>>>>> 4e81ea2 (Featire specs)
=======
-
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
=======
-
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
7
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d96cf3b (Featire specs)
=======
=======
>>>>>>> ee78f39 (Rebased)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
-
11
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d780a52 (Rebased)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
-
11
=======
-
11
>>>>>>> 9620751 (Featire specs)
=======
=======
>>>>>>> da83d1a (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6d21330 (Featire specs)
=======
>>>>>>> a2a431e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 27e3351 (Featire specs)
=======
>>>>>>> e733663 (Fix book_spec decrease quantity and price)
-
=======
-
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
-
>>>>>>> 7a02bbe (Featire specs)
=======
-
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
-
>>>>>>> 4552227 (Featire specs)
=======
-
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
7
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 83979de (Featire specs)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
-
7
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> a9bf83f (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
=======
-
7
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 12bcf81 (Featire specs)
=======
=======
>>>>>>> b832d45 (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
-
7
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3e35e (Featire specs)
=======
=======
=======
=======
>>>>>>> df37394 (Featire specs)
-
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
-
=======
-
>>>>>>> 752f0c0 (Featire specs)
=======
-
>>>>>>> 4e81ea2 (Featire specs)
=======
-
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
=======
-
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
7
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c54769d (Fix book_spec decrease quantity and price)
=======
=======
=======
-
7
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 1677b1a (Featire specs)
=======
=======
=======
-
7
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c346782 (Fix book_spec decrease quantity and price)
=======
=======
-
11
>>>>>>> a5d032d (Fix)
>>>>>>> b28889f (Fix)
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
>>>>>>> 3723aad (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
-
7
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 3b03895 (Featire specs)
=======
-
7
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
-
7
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
-
11
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
=======
-
7
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
=======
-
7
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
=======
-
15
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
=======
-
7
>>>>>>> d6f7da8 (Featire specs)
=======
-
7
>>>>>>> dacfb20 (Featire specs)
=======
-
7
>>>>>>> 78d0719 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> 9620751 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
=======
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
if book.nil?
=======
redirect_to books_path if @book.nil?
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
redirect_to books_path if @book.nil?
>>>>>>> 752f0c0 (Featire specs)
=======
redirect_to books_path if @book.nil?
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
redirect_to books_path if @book.nil?
>>>>>>> 08edf50 (Featire specs)
=======
redirect_to books_path if @book.nil?
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
redirect_to books_path if @book.nil?
>>>>>>> 7a02bbe (Featire specs)
=======
redirect_to books_path if @book.nil?
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
if book.nil?
>>>>>>> a5d032d (Fix)
=======
<<<<<<< HEAD
if book.nil?
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
=======
redirect_to books_path if @book.nil?
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
redirect_to books_path if @book.nil?
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
redirect_to books_path if @book.nil?
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
if book.nil?
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
=======
=======
redirect_to books_path if @book.nil?
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
=======
redirect_to books_path if @book.nil?
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
=======
redirect_to books_path if @book.nil?
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
=======
redirect_to books_path if @book.nil?
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
=======
redirect_to books_path if @book.nil?
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
=======
if book.nil?
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
=======
redirect_to books_path if @book.nil?
>>>>>>> d6f7da8 (Featire specs)
=======
redirect_to books_path if @book.nil?
>>>>>>> dacfb20 (Featire specs)
=======
redirect_to books_path if @book.nil?
>>>>>>> 78d0719 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
-
>>>>>>> 1d59aaa (Fix)
=======
<<<<<<< HEAD
-
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
-
>>>>>>> 6fba6be (Featire specs)
=======
<<<<<<< HEAD
-
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
-
>>>>>>> a9e66e9 (Featire specs)
=======
<<<<<<< HEAD
-
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
-
>>>>>>> ee5242b (Featire specs)
=======
<<<<<<< HEAD
-
>>>>>>> 96394f1 (Featire specs)
=======
<<<<<<< HEAD
-
>>>>>>> af057e3 (Featire specs)
=======
<<<<<<< HEAD
-
>>>>>>> 5507b42 (Featire specs)
=======
<<<<<<< HEAD
-
>>>>>>> 872e675 (Fix)
=======
<<<<<<< HEAD
-
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
-
>>>>>>> e5752db (Featire specs)
=======
<<<<<<< HEAD
-
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
-
>>>>>>> 904663c (Featire specs)
=======
<<<<<<< HEAD
-
>>>>>>> a9bf83f (Featire specs)
=======
<<<<<<< HEAD
-
>>>>>>> 563720e (Featire specs)
=======
<<<<<<< HEAD
-
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5c33a07 (Featire specs)
=======
=======
-
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 563720e (Featire specs)
=======
=======
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9bf83f (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
-
redirect_to books_path
-
else
-
15
<<<<<<< HEAD
=======
@reviews = ReviewDecorator.decorate_collection(Review.where(book_id: book.id).order(created_at: :desc))
-
15
>>>>>>> a5d032d (Fix)
@book = book.decorate
<<<<<<< HEAD
-
=======
-
>>>>>>> a5d032d (Fix)
end
<<<<<<< HEAD
<<<<<<< HEAD
-
<<<<<<< HEAD
=======
=======
>>>>>>> d780a52 (Rebased)
=======
>>>>>>> 83979de (Featire specs)
=======
>>>>>>> b3f2049 (Featire specs)
=======
>>>>>>> 12bcf81 (Featire specs)
=======
>>>>>>> fd3e35e (Featire specs)
=======
>>>>>>> c54769d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1677b1a (Featire specs)
=======
>>>>>>> c346782 (Fix book_spec decrease quantity and price)
=======
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> ee78f39 (Rebased)
-
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
-
=======
-
>>>>>>> 752f0c0 (Featire specs)
=======
-
>>>>>>> 4e81ea2 (Featire specs)
=======
-
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> d96cf3b (Featire specs)
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
=======
-
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f764a87 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a5d032d (Fix)
=======
=======
>>>>>>> ee78f39 (Rebased)
-
redirect_to books_path
-
else
-
11
<<<<<<< HEAD
<<<<<<< HEAD
=======
@reviews = ReviewDecorator.decorate_collection(Review.where(book_id: book.id).order(created_at: :desc))
-
11
>>>>>>> a5d032d (Fix)
=======
>>>>>>> ee78f39 (Rebased)
@book = book.decorate
<<<<<<< HEAD
<<<<<<< HEAD
-
=======
-
>>>>>>> a5d032d (Fix)
=======
-
>>>>>>> ee78f39 (Rebased)
end
<<<<<<< HEAD
<<<<<<< HEAD
-
<<<<<<< HEAD
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> d780a52 (Rebased)
=======
=======
<<<<<<< HEAD
>>>>>>> c033601 (Rebased)
>>>>>>> 93bdda9 (Featire specs)
=======
=======
-
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 83979de (Featire specs)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
=======
-
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> a9bf83f (Featire specs)
=======
=======
-
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ee5242b (Featire specs)
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 12bcf81 (Featire specs)
=======
=======
>>>>>>> b832d45 (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
=======
-
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3e35e (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
-
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a9e66e9 (Featire specs)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c54769d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
=======
=======
-
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 1677b1a (Featire specs)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
-
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c346782 (Fix book_spec decrease quantity and price)
=======
=======
-
<<<<<<< HEAD
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
-
>>>>>>> c033601 (Rebased)
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
-
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
=======
=======
=======
-
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
=======
=======
-
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
=======
-
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
=======
-
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
=======
-
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
=======
-
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
=======
-
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
=======
-
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
=======
-
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
=======
-
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
=======
-
>>>>>>> d6f7da8 (Featire specs)
=======
=======
>>>>>>> 6d21330 (Featire specs)
=======
>>>>>>> a2a431e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 27e3351 (Featire specs)
=======
>>>>>>> e733663 (Fix book_spec decrease quantity and price)
-
=======
-
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> da83d1a (Fix book_spec decrease quantity and price)
=======
=======
-
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 6d21330 (Featire specs)
=======
=======
-
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2a431e (Fix book_spec decrease quantity and price)
=======
=======
-
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 27e3351 (Featire specs)
=======
=======
-
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> e733663 (Fix book_spec decrease quantity and price)
=======
-
>>>>>>> dacfb20 (Featire specs)
=======
-
>>>>>>> 78d0719 (Featire specs)
end
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
-
=======
=======
>>>>>>> d780a52 (Rebased)
=======
>>>>>>> 83979de (Featire specs)
=======
>>>>>>> b3f2049 (Featire specs)
=======
>>>>>>> 12bcf81 (Featire specs)
=======
>>>>>>> fd3e35e (Featire specs)
=======
>>>>>>> c54769d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1677b1a (Featire specs)
=======
>>>>>>> c346782 (Fix book_spec decrease quantity and price)
=======
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1d59aaa (Fix)
-
=======
-
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
-
>>>>>>> 94841b5 (Featire specs)
=======
-
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
-
>>>>>>> 3b03895 (Featire specs)
=======
-
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
-
>>>>>>> e54deeb (Featire specs)
=======
-
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
-
>>>>>>> 9c0d812 (Featire specs)
=======
-
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
-
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
=======
-
=======
>>>>>>> df37394 (Featire specs)
=======
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
-
=======
-
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
-
>>>>>>> 9c0d812 (Featire specs)
=======
-
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
-
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
-
=======
-
>>>>>>> 752f0c0 (Featire specs)
=======
-
>>>>>>> 4e81ea2 (Featire specs)
=======
-
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> d96cf3b (Featire specs)
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
=======
-
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> a9e66e9 (Featire specs)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f764a87 (Fix book_spec decrease quantity and price)
=======
=======
-
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d780a52 (Rebased)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
-
=======
-
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 83979de (Featire specs)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
=======
-
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> a9bf83f (Featire specs)
=======
=======
-
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 12bcf81 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fd3e35e (Featire specs)
=======
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
-
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c54769d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> e5752db (Featire specs)
=======
=======
-
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 1677b1a (Featire specs)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
-
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c346782 (Fix book_spec decrease quantity and price)
=======
=======
-
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
=======
-
>>>>>>> c033601 (Rebased)
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
-
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
-
=======
-
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
=======
=======
-
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
=======
-
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
=======
-
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
=======
-
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
=======
-
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
=======
-
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
=======
-
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
=======
-
end
-
1
require_relative '../services/coupon_service'
-
-
1
class CouponsController < ApplicationController
-
1
def find
-
4
coupon = Coupon.find_by(code: params[:code])
-
4
order = Order.find(session[:order_id])
-
-
4
respond_to do |format|
-
4
format.json do
-
4
render json: CouponService.find_coupon(params, order, coupon)
-
end
-
end
-
end
-
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
=======
=======
>>>>>>> da83d1a (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6d21330 (Featire specs)
=======
>>>>>>> a2a431e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 27e3351 (Featire specs)
=======
>>>>>>> e733663 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d7fadcd (Featire specs)
-
=======
-
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
-
>>>>>>> 7a02bbe (Featire specs)
=======
-
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
-
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
=======
-
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
=======
>>>>>>> d7fadcd (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d7fadcd (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> d6f7da8 (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> f5da5ac (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5f79779 (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 56a05fb (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> da83d1a (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 6d21330 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2a431e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 27e3351 (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> e733663 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1ac6be1 (Fix)
=======
=======
>>>>>>> 78d0719 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 45f6de0 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 9bf2aae (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 7718476 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 5ce1a6d (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> cea736b (Fix book_spec decrease quantity and price)
-
=======
-
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
-
>>>>>>> 7a02bbe (Featire specs)
=======
-
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
-
>>>>>>> 4552227 (Featire specs)
=======
-
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> dacfb20 (Featire specs)
=======
=======
>>>>>>> 5f76842 (Featire specs)
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 93db8b1 (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5f76842 (Featire specs)
=======
>>>>>>> ea0650c (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> d7fadcd (Featire specs)
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 49e3b70 (Fix)
=======
>>>>>>> 78d0719 (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> f861b82 (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 2fd2048 (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> bc0ff2c (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 45f6de0 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9bf2aae (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 7718476 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
>>>>>>> 5ce1a6d (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> cea736b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
=======
>>>>>>> aa4fb26 (Add sort orders)
end
-
1
class HomeController < ApplicationController
-
1
def index
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> 9620751 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
=======
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0b5b269 (Fix)
=======
>>>>>>> d6f7da8 (Featire specs)
=======
>>>>>>> f5da5ac (Featire specs)
=======
>>>>>>> 5f79779 (Featire specs)
=======
>>>>>>> 56a05fb (Featire specs)
=======
>>>>>>> da83d1a (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6d21330 (Featire specs)
=======
>>>>>>> a2a431e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 27e3351 (Featire specs)
=======
>>>>>>> e733663 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1ac6be1 (Fix)
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1a9aba9 (Fix)
=======
>>>>>>> dacfb20 (Featire specs)
=======
>>>>>>> 93db8b1 (Featire specs)
=======
>>>>>>> 5f76842 (Featire specs)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d7fadcd (Featire specs)
=======
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 49e3b70 (Fix)
=======
>>>>>>> 78d0719 (Featire specs)
=======
>>>>>>> f861b82 (Featire specs)
=======
>>>>>>> 2fd2048 (Featire specs)
=======
>>>>>>> bc0ff2c (Featire specs)
=======
>>>>>>> 45f6de0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9bf2aae (Featire specs)
=======
>>>>>>> 7718476 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5ce1a6d (Featire specs)
=======
>>>>>>> cea736b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d15fe1d (Fix)
=======
=======
>>>>>>> 9620751 (Featire specs)
>>>>>>> b4763a2 (Featire specs)
=======
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
>>>>>>> bcd09ab (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> c006a44 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> 848bfa2 (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> 9ca3b84 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> fefbd35 (Featire specs)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 9dc109d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d6f7da8 (Featire specs)
=======
=======
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f5da5ac (Featire specs)
=======
=======
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5f79779 (Featire specs)
=======
=======
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 56a05fb (Featire specs)
=======
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> da83d1a (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6d21330 (Featire specs)
=======
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2a431e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 27e3351 (Featire specs)
=======
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
>>>>>>> e733663 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
>>>>>>> eaef86a (Fix)
=======
=======
>>>>>>> 9620751 (Featire specs)
>>>>>>> b35d1f8 (Featire specs)
=======
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
>>>>>>> a1fe6da (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 28fed3c (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> ed6aebd (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> 64d4167 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> 13fd74f (Featire specs)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 9dc109d (Featire specs)
>>>>>>> dacfb20 (Featire specs)
=======
=======
>>>>>>> 864f339 (Featire specs)
>>>>>>> 93db8b1 (Featire specs)
=======
=======
>>>>>>> a2de409 (Featire specs)
>>>>>>> 5f76842 (Featire specs)
=======
=======
>>>>>>> e54ceb0 (Featire specs)
>>>>>>> ea0650c (Featire specs)
=======
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 95ebdc2 (Featire specs)
>>>>>>> a038b16 (Featire specs)
=======
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
>>>>>>> d7fadcd (Featire specs)
=======
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
-
13
=======
-
3
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
>>>>>>> d6f7da8 (Featire specs)
=======
>>>>>>> f5da5ac (Featire specs)
=======
>>>>>>> dacfb20 (Featire specs)
=======
>>>>>>> 93db8b1 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> b4763a2 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> 864f339 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> b35d1f8 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
>>>>>>> a1fe6da (Featire specs)
=======
>>>>>>> 864f339 (Featire specs)
=======
-
3
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> f5da5ac (Featire specs)
=======
>>>>>>> 5f79779 (Featire specs)
=======
>>>>>>> 93db8b1 (Featire specs)
=======
>>>>>>> 5f76842 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> bcd09ab (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> a2de409 (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> a1fe6da (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> a2de409 (Featire specs)
=======
-
3
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> 5f79779 (Featire specs)
=======
>>>>>>> 56a05fb (Featire specs)
=======
>>>>>>> 5f76842 (Featire specs)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> c006a44 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> e54ceb0 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 28fed3c (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> e54ceb0 (Featire specs)
=======
-
3
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> 56a05fb (Featire specs)
=======
>>>>>>> da83d1a (Fix book_spec decrease quantity and price)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> ed6aebd (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
=======
-
3
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> da83d1a (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6d21330 (Featire specs)
=======
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
-
3
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> 6d21330 (Featire specs)
=======
>>>>>>> a2a431e (Fix book_spec decrease quantity and price)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 64d4167 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
=======
-
3
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> d15fe1d (Fix)
=======
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> a2a431e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 27e3351 (Featire specs)
=======
>>>>>>> eaef86a (Fix)
=======
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d7fadcd (Featire specs)
=======
-
13
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
-
13
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> fefbd35 (Featire specs)
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
=======
-
3
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 27e3351 (Featire specs)
=======
>>>>>>> e733663 (Fix book_spec decrease quantity and price)
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
=======
-
3
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0b5b269 (Fix)
=======
-
13
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1d59aaa (Fix)
=======
-
13
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d15fe1d (Fix)
=======
=======
>>>>>>> 9620751 (Featire specs)
>>>>>>> b4763a2 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
>>>>>>> bcd09ab (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> c006a44 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> 848bfa2 (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> 9ca3b84 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0b5b269 (Fix)
=======
=======
>>>>>>> 9dc109d (Featire specs)
<<<<<<< HEAD
>>>>>>> d6f7da8 (Featire specs)
=======
=======
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
>>>>>>> f5da5ac (Featire specs)
=======
=======
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5f79779 (Featire specs)
=======
=======
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 56a05fb (Featire specs)
=======
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> da83d1a (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6d21330 (Featire specs)
=======
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2a431e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 27e3351 (Featire specs)
=======
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> e733663 (Fix book_spec decrease quantity and price)
=======
=======
-
18
>>>>>>> 8f1bc14 (Fix)
>>>>>>> 1ac6be1 (Fix)
=======
-
13
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
>>>>>>> eaef86a (Fix)
=======
=======
>>>>>>> 9620751 (Featire specs)
>>>>>>> b35d1f8 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
>>>>>>> a1fe6da (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 28fed3c (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> ed6aebd (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> 64d4167 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
=======
-
3
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 13fd74f (Featire specs)
=======
=======
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
=======
-
3
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
=======
-
13
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
>>>>>>> 1a9aba9 (Fix)
=======
=======
>>>>>>> 9dc109d (Featire specs)
<<<<<<< HEAD
>>>>>>> dacfb20 (Featire specs)
=======
=======
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
>>>>>>> 93db8b1 (Featire specs)
=======
=======
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5f76842 (Featire specs)
=======
=======
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
>>>>>>> ea0650c (Featire specs)
=======
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
>>>>>>> a038b16 (Featire specs)
=======
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
>>>>>>> d7fadcd (Featire specs)
=======
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
=======
=======
-
18
>>>>>>> 8f1bc14 (Fix)
<<<<<<< HEAD
>>>>>>> 49e3b70 (Fix)
=======
=======
=======
>>>>>>> c1749d5 (Featire specs)
=======
>>>>>>> 1cb2e82 (Featire specs)
=======
>>>>>>> 8577deb (Featire specs)
=======
>>>>>>> 7b112c2 (Fix book_spec decrease quantity and price)
=======
>>>>>>> ebe5361 (Featire specs)
=======
>>>>>>> a455e8a (Fix book_spec decrease quantity and price)
=======
>>>>>>> d3d58e0 (Featire specs)
=======
>>>>>>> 59078f6 (Fix book_spec decrease quantity and price)
-
18
=======
-
3
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 65f3409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 78d0719 (Featire specs)
=======
=======
=======
-
3
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> c1749d5 (Featire specs)
<<<<<<< HEAD
>>>>>>> f861b82 (Featire specs)
=======
=======
=======
-
3
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 1cb2e82 (Featire specs)
<<<<<<< HEAD
>>>>>>> 2fd2048 (Featire specs)
=======
=======
=======
-
3
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8577deb (Featire specs)
<<<<<<< HEAD
>>>>>>> bc0ff2c (Featire specs)
=======
=======
=======
-
3
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 7b112c2 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 45f6de0 (Fix book_spec decrease quantity and price)
=======
=======
=======
-
3
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> ebe5361 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9bf2aae (Featire specs)
=======
=======
=======
-
3
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a455e8a (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 7718476 (Fix book_spec decrease quantity and price)
=======
=======
=======
-
3
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> d3d58e0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5ce1a6d (Featire specs)
=======
=======
=======
-
3
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 59078f6 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> cea736b (Fix book_spec decrease quantity and price)
=======
=======
-
18
>>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
@catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT))
=======
=======
>>>>>>> d780a52 (Rebased)
=======
>>>>>>> 83979de (Featire specs)
=======
>>>>>>> b3f2049 (Featire specs)
=======
>>>>>>> 12bcf81 (Featire specs)
=======
>>>>>>> fd3e35e (Featire specs)
=======
>>>>>>> c54769d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1677b1a (Featire specs)
=======
>>>>>>> c346782 (Fix book_spec decrease quantity and price)
=======
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> d15fe1d (Fix)
=======
>>>>>>> b4763a2 (Featire specs)
=======
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0b5b269 (Fix)
=======
>>>>>>> d6f7da8 (Featire specs)
=======
>>>>>>> f5da5ac (Featire specs)
=======
>>>>>>> 5f79779 (Featire specs)
=======
>>>>>>> 56a05fb (Featire specs)
=======
>>>>>>> da83d1a (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6d21330 (Featire specs)
=======
>>>>>>> a2a431e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 27e3351 (Featire specs)
=======
>>>>>>> e733663 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1ac6be1 (Fix)
=======
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> eaef86a (Fix)
=======
>>>>>>> b35d1f8 (Featire specs)
=======
>>>>>>> a1fe6da (Featire specs)
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1a9aba9 (Fix)
=======
>>>>>>> dacfb20 (Featire specs)
=======
>>>>>>> 93db8b1 (Featire specs)
=======
>>>>>>> 5f76842 (Featire specs)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d7fadcd (Featire specs)
=======
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 49e3b70 (Fix)
=======
>>>>>>> 78d0719 (Featire specs)
=======
>>>>>>> f861b82 (Featire specs)
=======
>>>>>>> 2fd2048 (Featire specs)
=======
>>>>>>> bc0ff2c (Featire specs)
=======
>>>>>>> 45f6de0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9bf2aae (Featire specs)
=======
>>>>>>> 7718476 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5ce1a6d (Featire specs)
=======
>>>>>>> cea736b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
@catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3))
=======
@catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT))
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
@catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT))
>>>>>>> 9c0d812 (Featire specs)
=======
@catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT))
=======
@catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3))
=======
@catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT))
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
@catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3))
=======
@catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT))
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
@catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT))
>>>>>>> 9c0d812 (Featire specs)
=======
@catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT))
>>>>>>> e5752db (Featire specs)
=======
@catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3))
=======
@catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT))
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
@catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3))
=======
@catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT))
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
@catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT))
>>>>>>> 9c0d812 (Featire specs)
=======
@catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT))
>>>>>>> 5506bd0 (Featire specs)
=======
@catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3))
=======
@catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT))
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
@catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3))
=======
@catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT))
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
@catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT))
>>>>>>> 9c0d812 (Featire specs)
=======
@catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT))
>>>>>>> 20256f8 (Featire specs)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
@catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT))
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
=======
@catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3))
=======
>>>>>>> df37394 (Featire specs)
=======
@catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3))
=======
@catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT))
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
=======
@catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3))
=======
>>>>>>> 715fac2 (Featire specs)
=======
@catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3))
=======
@catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT))
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
=======
@catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3))
=======
>>>>>>> 3dc272d (Featire specs)
=======
@catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3))
=======
@catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT))
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
@catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3))
=======
@catalog = Book.order('created_at DESC').first(3)
>>>>>>> 752f0c0 (Featire specs)
=======
@catalog = Book.order('created_at DESC').first(3)
>>>>>>> 4e81ea2 (Featire specs)
=======
@catalog = Book.order('created_at DESC').first(3)
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> d96cf3b (Featire specs)
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
=======
=======
@catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3))
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> 20256f8 (Featire specs)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f764a87 (Fix book_spec decrease quantity and price)
=======
=======
@catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT))
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d780a52 (Rebased)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
@catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT))
=======
@catalog = Book.order('created_at DESC').first(3)
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 83979de (Featire specs)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
=======
@catalog = Book.order('created_at DESC').first(3)
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> a9bf83f (Featire specs)
=======
=======
@catalog = Book.order('created_at DESC').first(3)
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 12bcf81 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fd3e35e (Featire specs)
=======
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
@catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3))
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c54769d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> e5752db (Featire specs)
=======
=======
@catalog = Book.order('created_at DESC').first(3)
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 1677b1a (Featire specs)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
@catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3))
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c346782 (Fix book_spec decrease quantity and price)
=======
=======
@catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT))
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
=======
@catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT))
>>>>>>> c033601 (Rebased)
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
@catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT))
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> 2a25e4c (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 864f339 (Featire specs)
=======
>>>>>>> a2de409 (Featire specs)
=======
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> ea0650c (Featire specs)
=======
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a038b16 (Featire specs)
=======
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d7fadcd (Featire specs)
=======
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
=======
>>>>>>> c1749d5 (Featire specs)
<<<<<<< HEAD
>>>>>>> f861b82 (Featire specs)
=======
=======
>>>>>>> 1cb2e82 (Featire specs)
<<<<<<< HEAD
>>>>>>> 2fd2048 (Featire specs)
=======
=======
>>>>>>> 8577deb (Featire specs)
<<<<<<< HEAD
>>>>>>> bc0ff2c (Featire specs)
=======
=======
>>>>>>> 7b112c2 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 45f6de0 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> ebe5361 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9bf2aae (Featire specs)
=======
=======
>>>>>>> a455e8a (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 7718476 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> d3d58e0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5ce1a6d (Featire specs)
=======
=======
>>>>>>> 59078f6 (Fix book_spec decrease quantity and price)
>>>>>>> cea736b (Fix book_spec decrease quantity and price)
@catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT))
=======
@catalog = Book.order('created_at DESC').first(3)
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
=======
=======
@catalog = Book.order('created_at DESC').first(3)
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
=======
@catalog = Book.order('created_at DESC').first(3)
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
=======
@catalog = Book.order('created_at DESC').first(3)
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
=======
@catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3))
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
=======
@catalog = Book.order('created_at DESC').first(3)
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
=======
@catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3))
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
=======
@catalog = Book.order('created_at DESC').first(3)
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
=======
@catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3))
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
=======
@catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT))
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
=======
@catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT))
>>>>>>> c033601 (Rebased)
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 2a25e4c (Featire specs)
=======
=======
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> f5da5ac (Featire specs)
=======
>>>>>>> f861b82 (Featire specs)
>>>>>>> a636fda (Featire specs)
=======
=======
@catalog = Book.order('created_at DESC').first(3)
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 3e9f99d (Featire specs)
=======
=======
=======
@catalog = Book.order('created_at DESC').first(3)
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5be567f (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 2ee03d3 (Featire specs)
=======
=======
=======
@catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3))
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
=======
=======
@catalog = Book.order('created_at DESC').first(3)
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5506bd0 (Featire specs)
=======
=======
=======
@catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3))
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
=======
@catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT))
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> d15fe1d (Fix)
=======
=======
>>>>>>> 8c32a77 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 864f339 (Featire specs)
=======
>>>>>>> a2de409 (Featire specs)
@catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT))
=======
@catalog = Book.order('created_at DESC').first(3)
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> b4763a2 (Featire specs)
=======
=======
=======
@catalog = Book.order('created_at DESC').first(3)
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> bcd09ab (Featire specs)
=======
=======
=======
@catalog = Book.order('created_at DESC').first(3)
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> c006a44 (Featire specs)
=======
=======
=======
@catalog = Book.order('created_at DESC').first(3)
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 848bfa2 (Featire specs)
=======
=======
=======
@catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3))
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
=======
=======
@catalog = Book.order('created_at DESC').first(3)
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9ca3b84 (Featire specs)
=======
=======
=======
@catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3))
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
=======
=======
@catalog = Book.order('created_at DESC').first(3)
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> fefbd35 (Featire specs)
=======
=======
=======
@catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3))
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
=======
@catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT))
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
>>>>>>> 0b5b269 (Fix)
=======
=======
@catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT))
=======
@catalog = Book.order('created_at DESC').first(3)
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9dc109d (Featire specs)
<<<<<<< HEAD
>>>>>>> d6f7da8 (Featire specs)
=======
=======
=======
@catalog = Book.order('created_at DESC').first(3)
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
>>>>>>> f5da5ac (Featire specs)
=======
=======
=======
@catalog = Book.order('created_at DESC').first(3)
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5f79779 (Featire specs)
=======
=======
=======
@catalog = Book.order('created_at DESC').first(3)
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 56a05fb (Featire specs)
=======
=======
=======
@catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3))
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> da83d1a (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> a038b16 (Featire specs)
=======
=======
@catalog = Book.order('created_at DESC').first(3)
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6d21330 (Featire specs)
=======
=======
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
=======
=======
@catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3))
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2a431e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> d7fadcd (Featire specs)
=======
=======
@catalog = Book.order('created_at DESC').first(3)
>>>>>>> 4552227 (Featire specs)
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 27e3351 (Featire specs)
=======
=======
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
=======
=======
@catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3))
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e733663 (Fix book_spec decrease quantity and price)
=======
=======
@catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT))
>>>>>>> 8f1bc14 (Fix)
<<<<<<< HEAD
>>>>>>> 1ac6be1 (Fix)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 3dc272d (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
=======
=======
@catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT))
>>>>>>> c033601 (Rebased)
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 8c32a77 (Featire specs)
=======
=======
>>>>>>> a1fe6da (Featire specs)
=======
>>>>>>> 93db8b1 (Featire specs)
>>>>>>> a636fda (Featire specs)
=======
=======
@catalog = Book.order('created_at DESC').first(3)
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 56ef3ac (Featire specs)
=======
=======
=======
@catalog = Book.order('created_at DESC').first(3)
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 113da87 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 8b420cf (Featire specs)
=======
=======
=======
@catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3))
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
=======
@catalog = Book.order('created_at DESC').first(3)
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 20256f8 (Featire specs)
=======
=======
=======
@catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3))
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
=======
@catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT))
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> eaef86a (Fix)
=======
=======
>>>>>>> 78d0719 (Featire specs)
=======
@catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT))
=======
@catalog = Book.order('created_at DESC').first(3)
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> b35d1f8 (Featire specs)
=======
=======
=======
@catalog = Book.order('created_at DESC').first(3)
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> a1fe6da (Featire specs)
=======
=======
=======
@catalog = Book.order('created_at DESC').first(3)
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 28fed3c (Featire specs)
=======
=======
=======
@catalog = Book.order('created_at DESC').first(3)
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ed6aebd (Featire specs)
=======
=======
=======
@catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3))
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
=======
=======
@catalog = Book.order('created_at DESC').first(3)
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> 64d4167 (Featire specs)
=======
=======
=======
@catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3))
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
=======
=======
@catalog = Book.order('created_at DESC').first(3)
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 13fd74f (Featire specs)
=======
=======
=======
@catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3))
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
=======
@catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT))
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
>>>>>>> 1a9aba9 (Fix)
=======
=======
@catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT))
=======
@catalog = Book.order('created_at DESC').first(3)
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9dc109d (Featire specs)
<<<<<<< HEAD
>>>>>>> dacfb20 (Featire specs)
=======
=======
=======
@catalog = Book.order('created_at DESC').first(3)
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
>>>>>>> 93db8b1 (Featire specs)
=======
=======
=======
@catalog = Book.order('created_at DESC').first(3)
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5f76842 (Featire specs)
=======
=======
=======
@catalog = Book.order('created_at DESC').first(3)
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
>>>>>>> ea0650c (Featire specs)
=======
=======
=======
@catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3))
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d7fadcd (Featire specs)
=======
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
=======
=======
@catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT))
>>>>>>> 8f1bc14 (Fix)
>>>>>>> 49e3b70 (Fix)
=======
>>>>>>> 65f3409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 78d0719 (Featire specs)
=======
=======
=======
@catalog = Book.order('created_at DESC').first(3)
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> c1749d5 (Featire specs)
<<<<<<< HEAD
>>>>>>> f861b82 (Featire specs)
=======
=======
=======
@catalog = Book.order('created_at DESC').first(3)
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 1cb2e82 (Featire specs)
<<<<<<< HEAD
>>>>>>> 2fd2048 (Featire specs)
=======
=======
=======
@catalog = Book.order('created_at DESC').first(3)
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 8577deb (Featire specs)
<<<<<<< HEAD
>>>>>>> bc0ff2c (Featire specs)
=======
=======
=======
@catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3))
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 7b112c2 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 45f6de0 (Fix book_spec decrease quantity and price)
=======
=======
=======
@catalog = Book.order('created_at DESC').first(3)
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> ebe5361 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9bf2aae (Featire specs)
=======
=======
=======
@catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3))
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> a455e8a (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 7718476 (Fix book_spec decrease quantity and price)
=======
=======
=======
@catalog = Book.order('created_at DESC').first(3)
>>>>>>> 4552227 (Featire specs)
>>>>>>> d3d58e0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5ce1a6d (Featire specs)
=======
=======
=======
@catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3))
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 59078f6 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> cea736b (Fix book_spec decrease quantity and price)
=======
=======
@catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT))
>>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> 9620751 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
=======
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0b5b269 (Fix)
=======
>>>>>>> d6f7da8 (Featire specs)
=======
>>>>>>> f5da5ac (Featire specs)
=======
>>>>>>> 5f79779 (Featire specs)
=======
>>>>>>> 56a05fb (Featire specs)
=======
>>>>>>> da83d1a (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6d21330 (Featire specs)
=======
>>>>>>> a2a431e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 27e3351 (Featire specs)
=======
>>>>>>> e733663 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1ac6be1 (Fix)
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1a9aba9 (Fix)
=======
>>>>>>> dacfb20 (Featire specs)
=======
>>>>>>> 93db8b1 (Featire specs)
=======
>>>>>>> 5f76842 (Featire specs)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d7fadcd (Featire specs)
=======
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 49e3b70 (Fix)
=======
>>>>>>> 78d0719 (Featire specs)
=======
>>>>>>> f861b82 (Featire specs)
=======
>>>>>>> 2fd2048 (Featire specs)
=======
>>>>>>> bc0ff2c (Featire specs)
=======
>>>>>>> 45f6de0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9bf2aae (Featire specs)
=======
>>>>>>> 7718476 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5ce1a6d (Featire specs)
=======
>>>>>>> cea736b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d15fe1d (Fix)
=======
=======
>>>>>>> 9620751 (Featire specs)
>>>>>>> b4763a2 (Featire specs)
=======
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
>>>>>>> bcd09ab (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> c006a44 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> 848bfa2 (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> 9ca3b84 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> fefbd35 (Featire specs)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 9dc109d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d6f7da8 (Featire specs)
=======
=======
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f5da5ac (Featire specs)
=======
=======
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5f79779 (Featire specs)
=======
=======
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 56a05fb (Featire specs)
=======
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> da83d1a (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6d21330 (Featire specs)
=======
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2a431e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 27e3351 (Featire specs)
=======
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
>>>>>>> e733663 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
>>>>>>> eaef86a (Fix)
=======
=======
>>>>>>> 9620751 (Featire specs)
>>>>>>> b35d1f8 (Featire specs)
=======
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
>>>>>>> a1fe6da (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 28fed3c (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> ed6aebd (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> 64d4167 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> 13fd74f (Featire specs)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 9dc109d (Featire specs)
>>>>>>> dacfb20 (Featire specs)
=======
=======
>>>>>>> 864f339 (Featire specs)
>>>>>>> 93db8b1 (Featire specs)
=======
=======
>>>>>>> a2de409 (Featire specs)
>>>>>>> 5f76842 (Featire specs)
=======
=======
>>>>>>> e54ceb0 (Featire specs)
>>>>>>> ea0650c (Featire specs)
=======
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 95ebdc2 (Featire specs)
>>>>>>> a038b16 (Featire specs)
=======
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
>>>>>>> d7fadcd (Featire specs)
=======
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
-
13
=======
-
3
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
>>>>>>> d6f7da8 (Featire specs)
=======
>>>>>>> f5da5ac (Featire specs)
=======
>>>>>>> dacfb20 (Featire specs)
=======
>>>>>>> 93db8b1 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> b4763a2 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> 864f339 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> b35d1f8 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
>>>>>>> a1fe6da (Featire specs)
=======
>>>>>>> 864f339 (Featire specs)
=======
-
3
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> f5da5ac (Featire specs)
=======
>>>>>>> 5f79779 (Featire specs)
=======
>>>>>>> 93db8b1 (Featire specs)
=======
>>>>>>> 5f76842 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> bcd09ab (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> a2de409 (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> a1fe6da (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> a2de409 (Featire specs)
=======
-
3
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> 5f79779 (Featire specs)
=======
>>>>>>> 56a05fb (Featire specs)
=======
>>>>>>> 5f76842 (Featire specs)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> c006a44 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> e54ceb0 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 28fed3c (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> e54ceb0 (Featire specs)
=======
-
3
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> 56a05fb (Featire specs)
=======
>>>>>>> da83d1a (Fix book_spec decrease quantity and price)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> ed6aebd (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
=======
-
3
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> da83d1a (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6d21330 (Featire specs)
=======
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
-
3
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> 6d21330 (Featire specs)
=======
>>>>>>> a2a431e (Fix book_spec decrease quantity and price)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 64d4167 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
=======
-
3
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> d15fe1d (Fix)
=======
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> a2a431e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 27e3351 (Featire specs)
=======
>>>>>>> eaef86a (Fix)
=======
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d7fadcd (Featire specs)
=======
-
13
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
-
13
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> fefbd35 (Featire specs)
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
=======
-
3
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 27e3351 (Featire specs)
=======
>>>>>>> e733663 (Fix book_spec decrease quantity and price)
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
=======
-
3
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0b5b269 (Fix)
=======
-
13
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1d59aaa (Fix)
=======
-
13
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d15fe1d (Fix)
=======
=======
>>>>>>> 9620751 (Featire specs)
>>>>>>> b4763a2 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
>>>>>>> bcd09ab (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> c006a44 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> 848bfa2 (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> 9ca3b84 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0b5b269 (Fix)
=======
=======
>>>>>>> 9dc109d (Featire specs)
<<<<<<< HEAD
>>>>>>> d6f7da8 (Featire specs)
=======
=======
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
>>>>>>> f5da5ac (Featire specs)
=======
=======
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5f79779 (Featire specs)
=======
=======
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 56a05fb (Featire specs)
=======
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> da83d1a (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6d21330 (Featire specs)
=======
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2a431e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 27e3351 (Featire specs)
=======
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> e733663 (Fix book_spec decrease quantity and price)
=======
=======
-
18
>>>>>>> 8f1bc14 (Fix)
>>>>>>> 1ac6be1 (Fix)
=======
-
13
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
>>>>>>> eaef86a (Fix)
=======
=======
>>>>>>> 9620751 (Featire specs)
>>>>>>> b35d1f8 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
>>>>>>> a1fe6da (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 28fed3c (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> ed6aebd (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> 64d4167 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
=======
-
3
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 13fd74f (Featire specs)
=======
=======
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
=======
-
3
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
=======
-
13
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
>>>>>>> 1a9aba9 (Fix)
=======
=======
>>>>>>> 9dc109d (Featire specs)
<<<<<<< HEAD
>>>>>>> dacfb20 (Featire specs)
=======
=======
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
>>>>>>> 93db8b1 (Featire specs)
=======
=======
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5f76842 (Featire specs)
=======
=======
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
>>>>>>> ea0650c (Featire specs)
=======
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
>>>>>>> a038b16 (Featire specs)
=======
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
>>>>>>> d7fadcd (Featire specs)
=======
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
=======
=======
-
18
>>>>>>> 8f1bc14 (Fix)
<<<<<<< HEAD
>>>>>>> 49e3b70 (Fix)
=======
=======
=======
>>>>>>> c1749d5 (Featire specs)
=======
>>>>>>> 1cb2e82 (Featire specs)
=======
>>>>>>> 8577deb (Featire specs)
=======
>>>>>>> 7b112c2 (Fix book_spec decrease quantity and price)
=======
>>>>>>> ebe5361 (Featire specs)
=======
>>>>>>> a455e8a (Fix book_spec decrease quantity and price)
=======
>>>>>>> d3d58e0 (Featire specs)
=======
>>>>>>> 59078f6 (Fix book_spec decrease quantity and price)
-
18
=======
-
3
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 65f3409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 78d0719 (Featire specs)
=======
=======
=======
-
3
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> c1749d5 (Featire specs)
<<<<<<< HEAD
>>>>>>> f861b82 (Featire specs)
=======
=======
=======
-
3
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 1cb2e82 (Featire specs)
<<<<<<< HEAD
>>>>>>> 2fd2048 (Featire specs)
=======
=======
=======
-
3
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8577deb (Featire specs)
<<<<<<< HEAD
>>>>>>> bc0ff2c (Featire specs)
=======
=======
=======
-
3
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 7b112c2 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 45f6de0 (Fix book_spec decrease quantity and price)
=======
=======
=======
-
3
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> ebe5361 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9bf2aae (Featire specs)
=======
=======
=======
-
3
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a455e8a (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 7718476 (Fix book_spec decrease quantity and price)
=======
=======
=======
-
3
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> d3d58e0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5ce1a6d (Featire specs)
=======
=======
=======
-
3
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 59078f6 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> cea736b (Fix book_spec decrease quantity and price)
=======
=======
-
18
>>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
@best_sellers = best_sellers
-
end
-
-
1
private
-
-
1
def best_sellers
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> 9620751 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
=======
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0b5b269 (Fix)
=======
>>>>>>> d6f7da8 (Featire specs)
=======
>>>>>>> f5da5ac (Featire specs)
=======
>>>>>>> 5f79779 (Featire specs)
=======
>>>>>>> 56a05fb (Featire specs)
=======
>>>>>>> da83d1a (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6d21330 (Featire specs)
=======
>>>>>>> a2a431e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 27e3351 (Featire specs)
=======
>>>>>>> e733663 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1ac6be1 (Fix)
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1a9aba9 (Fix)
=======
>>>>>>> dacfb20 (Featire specs)
=======
>>>>>>> 93db8b1 (Featire specs)
=======
>>>>>>> 5f76842 (Featire specs)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d7fadcd (Featire specs)
=======
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 49e3b70 (Fix)
=======
>>>>>>> 78d0719 (Featire specs)
=======
>>>>>>> f861b82 (Featire specs)
=======
>>>>>>> 2fd2048 (Featire specs)
=======
>>>>>>> bc0ff2c (Featire specs)
=======
>>>>>>> 45f6de0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9bf2aae (Featire specs)
=======
>>>>>>> 7718476 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5ce1a6d (Featire specs)
=======
>>>>>>> cea736b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d15fe1d (Fix)
=======
=======
>>>>>>> 9620751 (Featire specs)
>>>>>>> b4763a2 (Featire specs)
=======
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
>>>>>>> bcd09ab (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> c006a44 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> 848bfa2 (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> 9ca3b84 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> fefbd35 (Featire specs)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 9dc109d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d6f7da8 (Featire specs)
=======
=======
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f5da5ac (Featire specs)
=======
=======
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5f79779 (Featire specs)
=======
=======
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 56a05fb (Featire specs)
=======
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> da83d1a (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6d21330 (Featire specs)
=======
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2a431e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 27e3351 (Featire specs)
=======
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
>>>>>>> e733663 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
>>>>>>> eaef86a (Fix)
=======
=======
>>>>>>> 9620751 (Featire specs)
>>>>>>> b35d1f8 (Featire specs)
=======
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
>>>>>>> a1fe6da (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 28fed3c (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> ed6aebd (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> 64d4167 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> 13fd74f (Featire specs)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 9dc109d (Featire specs)
>>>>>>> dacfb20 (Featire specs)
=======
=======
>>>>>>> 864f339 (Featire specs)
>>>>>>> 93db8b1 (Featire specs)
=======
=======
>>>>>>> a2de409 (Featire specs)
>>>>>>> 5f76842 (Featire specs)
=======
=======
>>>>>>> e54ceb0 (Featire specs)
>>>>>>> ea0650c (Featire specs)
=======
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 95ebdc2 (Featire specs)
>>>>>>> a038b16 (Featire specs)
=======
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
>>>>>>> d7fadcd (Featire specs)
=======
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
-
13
=======
-
3
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> da83d1a (Fix book_spec decrease quantity and price)
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
-
3
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
-
3
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
-
3
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> ed6aebd (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
-
3
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 6d21330 (Featire specs)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
-
3
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> 6d21330 (Featire specs)
=======
>>>>>>> a2a431e (Fix book_spec decrease quantity and price)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 64d4167 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
=======
-
3
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> d15fe1d (Fix)
=======
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> a2a431e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 27e3351 (Featire specs)
=======
>>>>>>> eaef86a (Fix)
=======
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d7fadcd (Featire specs)
=======
-
13
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
-
13
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> fefbd35 (Featire specs)
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
=======
-
3
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 27e3351 (Featire specs)
=======
>>>>>>> e733663 (Fix book_spec decrease quantity and price)
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
=======
-
3
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0b5b269 (Fix)
=======
-
13
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1d59aaa (Fix)
=======
-
13
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d15fe1d (Fix)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
>>>>>>> c006a44 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> 848bfa2 (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> 9ca3b84 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0b5b269 (Fix)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> da83d1a (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6d21330 (Featire specs)
=======
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2a431e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 27e3351 (Featire specs)
=======
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> e733663 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 65f3409 (Featire specs)
=======
>>>>>>> c1749d5 (Featire specs)
=======
>>>>>>> 1cb2e82 (Featire specs)
=======
>>>>>>> 8577deb (Featire specs)
=======
>>>>>>> 7b112c2 (Fix book_spec decrease quantity and price)
=======
>>>>>>> ebe5361 (Featire specs)
=======
>>>>>>> a455e8a (Fix book_spec decrease quantity and price)
=======
>>>>>>> d3d58e0 (Featire specs)
=======
>>>>>>> 59078f6 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
-
18
>>>>>>> 8f1bc14 (Fix)
>>>>>>> 1ac6be1 (Fix)
=======
-
13
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
>>>>>>> eaef86a (Fix)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 28fed3c (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> ed6aebd (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> 64d4167 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
=======
-
3
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 13fd74f (Featire specs)
=======
=======
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
=======
-
3
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
=======
-
13
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
>>>>>>> 1a9aba9 (Fix)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
>>>>>>> a038b16 (Featire specs)
=======
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
>>>>>>> d7fadcd (Featire specs)
=======
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
=======
=======
-
18
>>>>>>> 8f1bc14 (Fix)
>>>>>>> 49e3b70 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT))
=======
=======
>>>>>>> d780a52 (Rebased)
=======
>>>>>>> 83979de (Featire specs)
=======
>>>>>>> b3f2049 (Featire specs)
=======
>>>>>>> 12bcf81 (Featire specs)
=======
>>>>>>> fd3e35e (Featire specs)
=======
>>>>>>> c54769d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1677b1a (Featire specs)
=======
>>>>>>> c346782 (Fix book_spec decrease quantity and price)
=======
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d15fe1d (Fix)
=======
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0b5b269 (Fix)
=======
>>>>>>> da83d1a (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6d21330 (Featire specs)
=======
>>>>>>> a2a431e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 27e3351 (Featire specs)
=======
>>>>>>> e733663 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1ac6be1 (Fix)
=======
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
>>>>>>> eaef86a (Fix)
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1a9aba9 (Fix)
=======
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d7fadcd (Featire specs)
=======
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 49e3b70 (Fix)
BookDecorator.decorate_collection(Book.first(4))
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT))
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT))
>>>>>>> 9c0d812 (Featire specs)
=======
BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT))
=======
BookDecorator.decorate_collection(Book.first(4))
=======
BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT))
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
BookDecorator.decorate_collection(Book.first(4))
=======
BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT))
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT))
>>>>>>> 9c0d812 (Featire specs)
=======
BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT))
>>>>>>> e5752db (Featire specs)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT))
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT))
>>>>>>> 9c0d812 (Featire specs)
=======
BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT))
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT))
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT))
>>>>>>> 9c0d812 (Featire specs)
=======
BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT))
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT))
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
=======
BookDecorator.decorate_collection(Book.first(4))
=======
>>>>>>> df37394 (Featire specs)
=======
BookDecorator.decorate_collection(Book.first(4))
=======
BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT))
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
=======
BookDecorator.decorate_collection(Book.first(4))
=======
>>>>>>> 715fac2 (Featire specs)
=======
BookDecorator.decorate_collection(Book.first(4))
=======
BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT))
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
=======
BookDecorator.decorate_collection(Book.first(4))
=======
>>>>>>> 3dc272d (Featire specs)
=======
BookDecorator.decorate_collection(Book.first(4))
=======
BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT))
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
BookDecorator.decorate_collection(Book.first(4))
=======
Book.first(4)
>>>>>>> 752f0c0 (Featire specs)
=======
Book.first(4)
>>>>>>> 4e81ea2 (Featire specs)
=======
Book.first(4)
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> d96cf3b (Featire specs)
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
=======
=======
BookDecorator.decorate_collection(Book.first(4))
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> 20256f8 (Featire specs)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f764a87 (Fix book_spec decrease quantity and price)
=======
=======
BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT))
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d780a52 (Rebased)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT))
=======
Book.first(4)
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 83979de (Featire specs)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 56ef3ac (Featire specs)
=======
=======
Book.first(4)
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 113da87 (Featire specs)
=======
=======
Book.first(4)
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 12bcf81 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fd3e35e (Featire specs)
=======
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
BookDecorator.decorate_collection(Book.first(4))
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c54769d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> 20256f8 (Featire specs)
=======
=======
Book.first(4)
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 1677b1a (Featire specs)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
=======
BookDecorator.decorate_collection(Book.first(4))
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c346782 (Fix book_spec decrease quantity and price)
=======
=======
BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT))
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
=======
BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT))
>>>>>>> c033601 (Rebased)
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT))
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c006a44 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
>>>>>>> fefbd35 (Featire specs)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 28fed3c (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> 64d4167 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
>>>>>>> 13fd74f (Featire specs)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT))
=======
Book.first(4)
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> ed6aebd (Featire specs)
=======
=======
Book.first(4)
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
=======
BookDecorator.decorate_collection(Book.first(4))
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 64d4167 (Featire specs)
=======
=======
Book.first(4)
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
=======
BookDecorator.decorate_collection(Book.first(4))
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
>>>>>>> 13fd74f (Featire specs)
=======
=======
Book.first(4)
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
=======
BookDecorator.decorate_collection(Book.first(4))
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
=======
BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT))
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1d59aaa (Fix)
=======
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
=======
BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT))
>>>>>>> c033601 (Rebased)
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
=======
BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT))
>>>>>>> a5d032d (Fix)
>>>>>>> d15fe1d (Fix)
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
=======
BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT))
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 0b5b269 (Fix)
=======
=======
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5a0bcc7 (Featire specs)
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
=======
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 95ebdc2 (Featire specs)
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
>>>>>>> d7fadcd (Featire specs)
=======
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT))
=======
BookDecorator.decorate_collection(Book.first(4))
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> da83d1a (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
>>>>>>> a038b16 (Featire specs)
=======
=======
Book.first(4)
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6d21330 (Featire specs)
=======
=======
>>>>>>> 95ebdc2 (Featire specs)
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
=======
=======
BookDecorator.decorate_collection(Book.first(4))
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2a431e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
>>>>>>> d7fadcd (Featire specs)
=======
=======
Book.first(4)
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 27e3351 (Featire specs)
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
=======
=======
BookDecorator.decorate_collection(Book.first(4))
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e733663 (Fix book_spec decrease quantity and price)
=======
=======
BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT))
>>>>>>> 8f1bc14 (Fix)
>>>>>>> 1ac6be1 (Fix)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 3dc272d (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
=======
=======
BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT))
>>>>>>> c033601 (Rebased)
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
=======
BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT))
>>>>>>> a5d032d (Fix)
>>>>>>> eaef86a (Fix)
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
=======
BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT))
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1a9aba9 (Fix)
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 95ebdc2 (Featire specs)
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5a0bcc7 (Featire specs)
>>>>>>> d7fadcd (Featire specs)
=======
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
=======
=======
BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT))
>>>>>>> 8f1bc14 (Fix)
>>>>>>> 49e3b70 (Fix)
-
end
-
end
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
=======
>>>>>>> 04108c4 (Manifest_cache true)
=======
>>>>>>> 49e3b70 (Fix)
=======
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d7fadcd (Featire specs)
=======
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3fef583 (Manifest_cache true)
=======
>>>>>>> 1a9aba9 (Fix)
=======
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> 75be480 (Manifest_cache true)
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> ee5935f (Manifest_cache true)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d15fe1d (Fix)
=======
>>>>>>> d66884b (Manifest_cache true)
=======
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0b5b269 (Fix)
=======
>>>>>>> 4e0a8d9 (Manifest_cache true)
=======
>>>>>>> da83d1a (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6d21330 (Featire specs)
=======
>>>>>>> a2a431e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 27e3351 (Featire specs)
=======
>>>>>>> e733663 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1ac6be1 (Fix)
=======
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 0c9131d (Manifest_cache true)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
>>>>>>> eaef86a (Fix)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 3dc272d (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4e7b845 (Manifest_cache true)
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5a0bcc7 (Featire specs)
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8f1bc14 (Fix)
-
1
require_relative '../services/coupon_service'
-
1
require_relative '../services/book_service'
-
-
1
class OrderBooksController < ApplicationController
-
1
before_action :update_order_last_action
-
1
def add_to_order
-
4
product = OrderBook.new(order_id: params[:order_id], book_id: params[:book_id], quantity: params[:quantity])
-
-
4
respond_to do |format|
-
4
format.html
-
4
format.json do
-
4
if product.save
-
4
render json: { notice: 'Added!' }
-
else
-
render json: { notice: 'Error!' }
-
end
-
end
-
end
-
end
-
-
1
def delete_product
-
1
product = OrderBook.find_by(order_id: params[:order_id], book_id: params[:book_id])
-
-
1
if product.destroy
-
1
redirect_to orders_path, notice: I18n.t('order.messages.delete')
-
else
-
redirect_to orders_path, alert: I18n.t('order.errors.error_delete')
-
end
-
end
-
-
1
def update_quantity
-
2
product = OrderBook.find_by(order_id: params[:order_id], book_id: params[:book_id])
-
2
book = Book.find(params[:book_id])
-
2
order = Order.find(params[:order_id])
-
2
coupon = Coupon.find_by(code: params[:code])
-
-
2
respond_to do |format|
-
2
format.html
-
2
format.json do
-
2
render json: BookService.quantity_update(params, product, order, book, coupon)
-
end
-
end
-
end
-
-
1
def update
-
product = OrderBook.find_by(order_id: session[:order_id], book_id: params[:book_id])
-
-
product.update(quantity: params[:quantity])
-
-
redirect_to orders_path
-
end
-
-
1
private
-
-
1
def order_item_params
-
params.permit(%i[book_id quantity order_id])
-
end
-
-
1
def update_order_last_action
-
7
Order.find(session[:order_id]).update(last_action: DateTime.now)
-
end
-
end
-
1
class OrdersController < ApplicationController
-
1
def index
-
12
@cart = Order.find(session[:order_id]).decorate
-
end
-
-
1
def show
-
5
if current_user
-
2
@order = Order.find_by(id: session[:order_id], user_id: current_user.id).decorate
-
2
render 'orders/show'
-
else
-
3
redirect_to new_checkout_path
-
end
-
end
-
end
>>>>>>> 7c4ea7f (Fix)
=======
=======
>>>>>>> eaef86a (Fix)
-
1
class ReviewsController < ApplicationController
-
1
before_action :authenticate_user!
-
-
1
def create
-
2
@review = Review.new(review_params)
-
-
2
if @review.save
-
1
redirect_to book_path(@review.book), notice: I18n.t('review.success')
-
else
-
1
redirect_to book_path(@review.book), alert: @review.errors.full_messages.join(', ')
-
end
-
end
-
-
1
private
-
-
1
def review_params
-
2
params.permit(:title, :body, :book_id, :user_id, :rating, :verified)
-
end
-
end
-
1
class UsersController < ApplicationController
-
1
before_action :authenticate_user!
-
-
1
def edit
-
9
@user_billing = Billing.find_or_create_by(user_id: current_user.id)
-
9
@user_shipping = Shipping.find_or_create_by(user_id: current_user.id)
-
end
-
-
1
def update
-
5
update_user = UserUpdate.call(permitted_params: permitted_params, current_user: current_user)
-
-
5
if update_user.success?
-
4
redirect_to edit_user_path, notice: I18n.t('settings.message.update')
-
else
-
1
redirect_to edit_user_path, alert: I18n.t('settings.error.error')
-
end
-
end
-
-
1
def destroy
-
current_user.destroy
-
redirect_to root_path, notice: I18n.t('devise.registrations.destroyed')
-
end
-
-
1
def permitted_params
-
5
params.permit(
-
user: %i[password current_password password_confirmation email],
-
billing: %i[first_name last_name address city zip country phone],
-
shipping: %i[first_name last_name address city zip country phone]
-
)
-
end
-
end
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> d15fe1d (Fix)
=======
=======
=======
>>>>>>> 4e7b845 (Manifest_cache true)
=======
=======
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> d66884b (Manifest_cache true)
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
-
1
require_relative '../services/coupon_service'
-
1
require_relative '../services/book_service'
-
-
1
class OrderBooksController < ApplicationController
-
1
before_action :update_order_last_action
-
1
def add_to_order
-
4
product = OrderBook.new(order_id: params[:order_id], book_id: params[:book_id], quantity: params[:quantity])
-
-
4
respond_to do |format|
-
4
format.html
-
4
format.json do
-
4
if product.save
-
4
render json: { notice: 'Added!' }
-
else
-
render json: { notice: 'Error!' }
-
end
-
end
-
end
-
end
-
-
1
def delete_product
-
product = OrderBook.find_by(order_id: params[:order_id], book_id: params[:book_id])
-
-
if product.destroy
-
redirect_to orders_path, notice: I18n.t('order.messages.delete')
-
else
-
redirect_to orders_path, alert: I18n.t('order.errors.error_delete')
-
end
-
end
-
-
1
def update_quantity
-
2
product = OrderBook.find_by(order_id: params[:order_id], book_id: params[:book_id])
-
2
book = Book.find(params[:book_id])
-
2
order = Order.find(params[:order_id])
-
2
coupon = Coupon.find_by(code: params[:code])
-
-
2
respond_to do |format|
-
2
format.html
-
2
format.json do
-
2
render json: BookService.quantity_update(params, product, order, book, coupon)
-
end
-
end
-
end
-
-
1
private
-
-
1
def order_item_params
-
params.permit(%i[book_id quantity order_id])
-
end
-
-
1
def update_order_last_action
-
6
Order.find(session[:order_id]).update(last_action: DateTime.now)
-
end
-
end